From 782242c5eb0ef980330fefb4a85196d3745e05a0 Mon Sep 17 00:00:00 2001 From: kastdeur Date: Tue, 24 Mar 2015 23:55:36 +0100 Subject: [PATCH 01/33] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..aadd5ff --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# lilydrum-trial +First trial with github, purpose is to set up a lilydrum file in the same way as there is a bagpipe.ly. Main focus is on pipeband snare drumming. From f1e795e28feff16c04119d7ab49329e9c5d8fb10 Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 00:10:41 +0100 Subject: [PATCH 02/33] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index aadd5ff..ca9199d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # lilydrum-trial First trial with github, purpose is to set up a lilydrum file in the same way as there is a bagpipe.ly. Main focus is on pipeband snare drumming. + +Somehow, the drums part in lilypond does not cover a notation with only right left. That is right is above the line and left is below it. In the same manner as the bagpipe.ly file, flams and drags are defined as a shortcut. + +There has been a lilypond include file earlier made by Simon Froger (which includes all of the above). So first version is a shameless copy. +This is meant to extend or translate some parts. + +The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970 From d27df402ca63fb3f1111387e2f8c2f2cd29b3e1a Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 00:12:57 +0100 Subject: [PATCH 03/33] Create lilydrum.ly Copied the original file by Simon Froger --- lilydrum.ly | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 lilydrum.ly diff --git a/lilydrum.ly b/lilydrum.ly new file mode 100644 index 0000000..825fd2b --- /dev/null +++ b/lilydrum.ly @@ -0,0 +1,133 @@ +%{ + LilyPond file definitions for Highland snare drum scores. + + Author : Simon Froger + + Please save the following definitions as scottish-drums.ily and add this line to your score : + \include "[path]/scottish-drums.ily" + + Music has to be put into : + \new DrumStaff { + \drummode { + [musique] + } + } + +%} + + +% Note names defs : "d" for the right hand and "g" for the left hand +drumPitchNames = +#(append '( + (d . main-droite) + (g . main-gauche) + ) + drumPitchNames +) + +% position according to the line : right hand up and left hand down +#(define mysnaredrums '( + (main-droite default #f 1) + (main-gauche default #f -1)) +) + +\layout { + % no indent + indent = 0 + % rolls number : markups should be preceeded by + \textLengthOn + % dynamics up + \dynamicUp + \set DrumStaff.drumStyleTable = #(alist->hash-table mysnaredrums) + \context { + \DrumStaff + % one line par staff + \override StaffSymbol.line-positions = #'(0) + % bar line length + \override BarLine.bar-extent = #'(-2 . 2) + % stems + \override Stem.direction = #-1 % stems down + \override Stem.length = #11 % unbeamed stems lenght + \override Stem.stemlet-length = #1.5 % short stem length + % beam at same height + \override Beam.positions = #'(-5.5 . -5.5) + % slurs bellow rolls number + \override TextScript.outside-staff-priority = ##f + \override TextScript.side-axis = #0 + \override TextScript.staff-padding = #3 + \override TextScript.X-offset = #2 % padding to stems + \override TextScript.extra-offset = #'(-0.3 . 0) + % tremolos (rolls) + \override StemTremolo.slope = #0.5 % slope + \override StemTremolo.beam-width = #1.5 % beam-width + \override StemTremolo.beam-thickness = #0.3 % beam-thickness + \override StemTremolo.extra-offset = #'(0 . 0.6) % vertical pos. position + %\override StemTremolo.Y-offset = #-3.3 + % repeat brackets + \consists "Horizontal_bracket_engraver" + \override HorizontalBracket.staff-padding = #6.5 % staff-padding + \override HorizontalBracket.direction = #DOWN % brackets under thr staff + \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets + } + \context { + \Score + \override RehearsalMark.break-align-symbols = #'(clef) + \override RehearsalMark.padding = #3 + \override VoltaBracket.edge-height = #'(1.5 . 1.5) + } +} + +% dynamics +v = #(define-event-function (parser location) () + #{ \upbow #} +) + +% repeat brackets +dr = #(define-event-function (parser location) () + #{ \startGroup #} +) +fr = #(define-event-function (parser location) () + #{ \stopGroup #} +) + + +% dynamics with extended lines +dynLine = #(define-music-function + (parser location text) + (markup?) + #{ + \once \override TextSpanner.style = #'line + \once \override TextSpanner.bound-details.left.text = \markup { + \combine + \draw-line #'(0 . -1) + \draw-line #'(1 . 0) + \dynamic #text + } + \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } + #}) + +% grace notes +startGraceMusic = { + \stemUp \tiny + \override Flag.stroke-style = #"grace" + \once \override Beam.positions = #'(3 . 3) + \once \override DrumStaff.Stem.length = #7 +} + +stopGraceMusic = { + \revert Flag.stroke-style + \normalsize + \stemNeutral +} + +% FLAS & DRAGS : +flad = \drummode { \grace { g8 } } % right Fla +fladdr = \drummode { \grace { g8\startGroup } } % with start repeat +flag = \drummode { \grace { d8 } } % left Fla +flagdr = \drummode { \grace { d8\startGroup } } % with start repeat +dragd = \drummode { \grace{ g16[ g] }} % right Drag +dragddr = \drummode { \grace{ g16[\startGroup g] }} % with start repeat +dragg = \drummode { \grace{ d16[ d] }} % left Drag +draggdr = \drummode { \grace{ d16[\startGroup d] }} % with start repeat + +% ====== END OF INCLUDED FILE ======================= From 849165d71a904e647ef9831ed6f79e1c8119a905 Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 00:14:16 +0100 Subject: [PATCH 04/33] Create example.ly --- example.ly | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 example.ly diff --git a/example.ly b/example.ly new file mode 100644 index 0000000..36722c8 --- /dev/null +++ b/example.ly @@ -0,0 +1,23 @@ +% include the lilydrum file +include lilydrum.ly + +% Now a tiny example : 6/8 +\score { + \new DrumStaff { + \drummode { + \time 6/8 + \partial 8 d8:32(_"7" | + \repeat volta 2 { + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \fladdr d8. d16 g8 d4.:32(_"13" | + d8.) g16 d8 \flag g4 d8:32(_"7" \fr | + \break + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \fladdr d8. d16:64(_"5" d8) \flad d8. d16 \flag g8 | + d8.:32(_"5" d16) \flag g8 \flad d4. \fr | + } + } + } +} From ed824ef1003d02028c5623569a8daf8627e95893 Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 00:34:45 +0100 Subject: [PATCH 05/33] Update README.md changed title and added link to svenax's bagpipemusic git --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca9199d..420fa71 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# lilydrum-trial -First trial with github, purpose is to set up a lilydrum file in the same way as there is a bagpipe.ly. Main focus is on pipeband snare drumming. +# pipeband-drumming +First trial with github, purpose is to set up a lilypond file in the same way as there is a bagpipe.ly (see github.com/svenax/bagpipemusic). Main focus is on pipeband snare drumming. Somehow, the drums part in lilypond does not cover a notation with only right left. That is right is above the line and left is below it. In the same manner as the bagpipe.ly file, flams and drags are defined as a shortcut. From d91ebcf33db298bd911990f37a2b571c1c26a59f Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 01:06:13 +0100 Subject: [PATCH 06/33] Create alexander_mackenzie.ly First tune written in lilypond --- airs/alexander_mackenzie.ly | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 airs/alexander_mackenzie.ly diff --git a/airs/alexander_mackenzie.ly b/airs/alexander_mackenzie.ly new file mode 100644 index 0000000..23c1e21 --- /dev/null +++ b/airs/alexander_mackenzie.ly @@ -0,0 +1,47 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums{ + \time 6/8 + + % Part 1 + \repeat volta 2 { + \partial 8 d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. d32 | + + \break + + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + + } + + % Part 2 ( Part 2.2 = Part 1) + d8:32( + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> d8:32( | + g4) \flamd d16. g32 d8:32( g8.) g16 | + d4.:32( d4) d8:32( | + + \break + + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> \flamd d16. g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + } +} + +\header { + meter = "Slow March" + title = "Alexander MacKenzie" + composer = "E.T. de Boone, 2015" + instrument = "Side" +} From 3421320ee7f94204b8f27769d89ae863ce13c8a2 Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 01:07:28 +0100 Subject: [PATCH 07/33] Update example.ly changed fla's to flams --- example.ly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example.ly b/example.ly index 36722c8..d235e05 100644 --- a/example.ly +++ b/example.ly @@ -1,7 +1,7 @@ % include the lilydrum file include lilydrum.ly -% Now a tiny example : 6/8 +% Now a tiny example : \score { \new DrumStaff { \drummode { @@ -11,12 +11,12 @@ include lilydrum.ly g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | \fladdr d8. d16 g8 d4.:32(_"13" | - d8.) g16 d8 \flag g4 d8:32(_"7" \fr | + d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | \break g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \fladdr d8. d16:64(_"5" d8) \flad d8. d16 \flag g8 | - d8.:32(_"5" d16) \flag g8 \flad d4. \fr | + \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | + d8.:32(_"5" d16) \flamg g8 \flamd d4. \fr | } } } From 73f5dcf0e1579946ce9fe7b48b1014ede6c4e41d Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 01:08:42 +0100 Subject: [PATCH 08/33] Update lilydrum.ly Changed "fla's" to "flams" --- lilydrum.ly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lilydrum.ly b/lilydrum.ly index 825fd2b..8114e90 100644 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -120,11 +120,11 @@ stopGraceMusic = { \stemNeutral } -% FLAS & DRAGS : -flad = \drummode { \grace { g8 } } % right Fla -fladdr = \drummode { \grace { g8\startGroup } } % with start repeat -flag = \drummode { \grace { d8 } } % left Fla -flagdr = \drummode { \grace { d8\startGroup } } % with start repeat +% FLAMS & DRAGS : +flamd = \drummode { \grace { g8 } } % right Flam +flamddr = \drummode { \grace { g8\startGroup } } % with start repeat +flamg = \drummode { \grace { d8 } } % left Flam +flamgdr = \drummode { \grace { d8\startGroup } } % with start repeat dragd = \drummode { \grace{ g16[ g] }} % right Drag dragddr = \drummode { \grace{ g16[\startGroup g] }} % with start repeat dragg = \drummode { \grace{ d16[ d] }} % left Drag From 01781a7f4e44651bdca9185d172ac8780717bbb6 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 25 Mar 2015 02:45:02 +0100 Subject: [PATCH 09/33] Added Ruffs --- lilydrum.ly | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/lilydrum.ly b/lilydrum.ly index 8114e90..1b3a7a6 100644 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -1,10 +1,10 @@ %{ LilyPond file definitions for Highland snare drum scores. - Author : Simon Froger - - Please save the following definitions as scottish-drums.ily and add this line to your score : - \include "[path]/scottish-drums.ily" + This file was first created by Simon Froger. + + Include by using : + \include "[path]/lilydrum.ly" Music has to be put into : \new DrumStaff { @@ -19,29 +19,31 @@ % Note names defs : "d" for the right hand and "g" for the left hand drumPitchNames = #(append '( - (d . main-droite) - (g . main-gauche) + (d . right-hand) + (g . left-hand) ) drumPitchNames ) % position according to the line : right hand up and left hand down -#(define mysnaredrums '( - (main-droite default #f 1) - (main-gauche default #f -1)) +#(define pipebandsnaredrums '( + (right-hand default #f 1) + (left-hand default #f -1)) ) +% Layout tweaks for good defaults \layout { % no indent indent = 0 % rolls number : markups should be preceeded by \textLengthOn + % dynamics up \dynamicUp - \set DrumStaff.drumStyleTable = #(alist->hash-table mysnaredrums) + \set DrumStaff.drumStyleTable = #(alist->hash-table pipebandsnaredrums) \context { \DrumStaff - % one line par staff + % one line per staff \override StaffSymbol.line-positions = #'(0) % bar line length \override BarLine.bar-extent = #'(-2 . 2) @@ -51,7 +53,7 @@ drumPitchNames = \override Stem.stemlet-length = #1.5 % short stem length % beam at same height \override Beam.positions = #'(-5.5 . -5.5) - % slurs bellow rolls number + % slurs below rolls number \override TextScript.outside-staff-priority = ##f \override TextScript.side-axis = #0 \override TextScript.staff-padding = #3 @@ -108,7 +110,7 @@ dynLine = #(define-music-function % grace notes startGraceMusic = { - \stemUp \tiny + \stemUp \tiny \override Flag.stroke-style = #"grace" \once \override Beam.positions = #'(3 . 3) \once \override DrumStaff.Stem.length = #7 @@ -120,14 +122,20 @@ stopGraceMusic = { \stemNeutral } -% FLAMS & DRAGS : +% Flams flamd = \drummode { \grace { g8 } } % right Flam flamddr = \drummode { \grace { g8\startGroup } } % with start repeat flamg = \drummode { \grace { d8 } } % left Flam flamgdr = \drummode { \grace { d8\startGroup } } % with start repeat + +% Drags dragd = \drummode { \grace{ g16[ g] }} % right Drag dragddr = \drummode { \grace{ g16[\startGroup g] }} % with start repeat dragg = \drummode { \grace{ d16[ d] }} % left Drag draggdr = \drummode { \grace{ d16[\startGroup d] }} % with start repeat -% ====== END OF INCLUDED FILE ======================= +% Ruff +ruffg = \drummode { \grace{ g16[ d g] }} % left Ruff +ruffgdr = \drummode { \grace{ g16[\startGroup d g] }} % with start repeat +ruffd = \drummode { \grace{ d16[ g d] }} % right Ruff +ruffd = \drummode { \grace{ d16[\startGroup g d] }} % with start repeat From fc041cfec543eedbfdf3df564c4f20c78f1d8afa Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 25 Mar 2015 03:38:39 +0100 Subject: [PATCH 10/33] Added score for Black Bear Fixed some typo's in Alexander MacKenzie --- 2-4_marches/black_bear.ly | 50 ++++++++++++++++++++++++++++++++ airs/alexander_mackenzie.ly | 57 +++++++++++++++++++------------------ 2 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 2-4_marches/black_bear.ly diff --git a/2-4_marches/black_bear.ly b/2-4_marches/black_bear.ly new file mode 100644 index 0000000..a034c77 --- /dev/null +++ b/2-4_marches/black_bear.ly @@ -0,0 +1,50 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + \break + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 + + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + d8 + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + \break + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) \bar "|." + + }% End of drums % +} + +\header { + title = "Black Bear" + meter = "March" + composer = "E.T. de Boone, 2015" + instrument = "Side" +} \ No newline at end of file diff --git a/airs/alexander_mackenzie.ly b/airs/alexander_mackenzie.ly index 23c1e21..2fd064d 100644 --- a/airs/alexander_mackenzie.ly +++ b/airs/alexander_mackenzie.ly @@ -3,45 +3,48 @@ \include "lilydrum.ly" \score { - \drums{ + \drums { \time 6/8 % Part 1 \repeat volta 2 { - \partial 8 d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. d32 | + \partial 8 d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | - \break - - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - - } + \break + + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + + } + + \break % Part 2 ( Part 2.2 = Part 1) - d8:32( - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> d8:32( | - g4) \flamd d16. g32 d8:32( g8.) g16 | - d4.:32( d4) d8:32( | + d8:32( + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> d8:32( | + g4) \flamd d16. g32 d8:32( g8.) g16 | + d4.:32( d4) d8:32( | - \break + \break - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> \flamd d16. g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - } + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> \flamd d16. g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + + }% End of drums % } \header { - meter = "Slow March" title = "Alexander MacKenzie" + meter = "Slow March" composer = "E.T. de Boone, 2015" instrument = "Side" -} +} \ No newline at end of file From 532c9bb2b32255ac7814a8a3520d17c59c9b2ccd Mon Sep 17 00:00:00 2001 From: kastdeur Date: Wed, 25 Mar 2015 05:10:17 +0100 Subject: [PATCH 11/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 420fa71..10d34a9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # pipeband-drumming -First trial with github, purpose is to set up a lilypond file in the same way as there is a bagpipe.ly (see github.com/svenax/bagpipemusic). Main focus is on pipeband snare drumming. +First trial with github, purpose is to set up a lilypond file in the same way as there is a bagpipe.ly (see github.com/svenax/bagpipemusic). Main focus is on pipeband snare drumming. Note that it would be best if they are compatible to create fullscores (see fullscore/ folder for first set up of Black Bear) Somehow, the drums part in lilypond does not cover a notation with only right left. That is right is above the line and left is below it. In the same manner as the bagpipe.ly file, flams and drags are defined as a shortcut. From 4406902a04212e162adbf682817da71047119fd3 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 25 Mar 2015 05:12:01 +0100 Subject: [PATCH 12/33] First try of creating a full score of Black Bear --- .../black_bear/Black_Bear_Hornpipe_The.bww | 71 +++++++++++++++++++ .../2-4_marches/black_bear/black_bear.full.ly | 26 +++++++ .../2-4_marches/black_bear/black_bear.head.ly | 6 ++ .../black_bear/black_bear.pipes.ly | 46 ++++++++++++ .../black_bear/black_bear.snare.ly | 48 +++++++++++++ 5 files changed, 197 insertions(+) create mode 100755 fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww create mode 100644 fullscores/2-4_marches/black_bear/black_bear.full.ly create mode 100644 fullscores/2-4_marches/black_bear/black_bear.head.ly create mode 100644 fullscores/2-4_marches/black_bear/black_bear.pipes.ly create mode 100644 fullscores/2-4_marches/black_bear/black_bear.snare.ly diff --git a/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww b/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww new file mode 100755 index 0000000..b34acba --- /dev/null +++ b/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww @@ -0,0 +1,71 @@ +Bagpipe Reader:1.0 + +MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69) + +FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880) + +InstrumentMappings,(71,71,45,33,1000,60,70) + +GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200) + +FontSizes,(90,100,75,80,250) + +TuneFormat,(1,0,M,L,500,500,500,500,L,1,0) + + + +"The Black Bear Hornpipe",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0) + +"March",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0) + +"Trad.",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) + +"P.M. FrankJan de Boone-The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) +"B 3",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0) +"2001",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0) +TuneTempo,84 + + +& sharpf sharpc 2_4 I!'' gg LAr_8 'la Bl_16 +! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! dbe Er_8 gg Bl_8 grp Br_8 gg Er_16 Dl_16 +! gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c gg LAr_16 'la Bl_32 gg Cr_32 dg LAl_16 'la + +!t + +& sharpf sharpc thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! dbe Er_8 grp El_8 gg Er_16 'e HGl_32 tg Fr_32 El_16 'e +! thrd Dr_8 gg Fl_8 thrd D_8 ''!I + + +"part 2" + +& sharpf sharpc space E_8 +! gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16 thrd Dr_8 gg Dr_16 El_16 +! dbhg HGr_8 tg Fr_16 El_16 gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32 +! gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16 thrd Dr_8 gg Dr_16 El_16 +! dbhg HGr_8 tg Fr_16 El_16 gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32 +!t + +& sharpf sharpc + HAr_8 LAr_16 dbla LAl_16 gg Cr_8 dg LAr_16 dbla LAl_16 +! gg Dr_8 Br_16 dbb Bl_16 gg Er_8 Cr_16 dbc Cl_16 +! gg Dr_32 Fl_16 'f gg Dr_32 Fl_16 'f Er_16 'e HGl_32 tg Fr_32 HGl_16 'hg +! HAr_8 grp HAl_8 strhg HAr_16 'ha HGl_32 tg Fl_16 'f El_16 + +!I + +& sharpf sharpc + thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! dbe Er_8 gg Bl_8 grp Br_8 gg Er_16 Dl_16 +! gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c gg LAr_16 'la Bl_32 gg Cr_32 dg LAl_16 'la + +!t + +& sharpf sharpc thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 +! dbe Er_8 grp El_8 gg Er_16 'e HGl_32 tg Fr_32 El_16 'e +! thrd Dr_8 gg Fl_8 thrd D_8 !I \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.full.ly b/fullscores/2-4_marches/black_bear/black_bear.full.ly new file mode 100644 index 0000000..6a236c7 --- /dev/null +++ b/fullscores/2-4_marches/black_bear/black_bear.full.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "black_bear.pipes.ly" +\include "black_bear.snare.ly" + +#(set-default-paper-size "a4landscape") + +\score { + { + \new StaffGroup << + \new Staff \with { + instrumentName = #"Pipes" + shortInstrumentName = #"P" + } \pipes + \new DrumStaff \with { + instrumentName = #"Snare" + shortInstrumentName = #"S.D." + } \snare + >> + } +} +\header { + title = "Black Bear" + meter = "March" + instrument = "" +} \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.head.ly b/fullscores/2-4_marches/black_bear/black_bear.head.ly new file mode 100644 index 0000000..5fdcae4 --- /dev/null +++ b/fullscores/2-4_marches/black_bear/black_bear.head.ly @@ -0,0 +1,6 @@ +\version "2.18.2" + +\header { + title = "Black Bear" + meter = "March" +} diff --git a/fullscores/2-4_marches/black_bear/black_bear.pipes.ly b/fullscores/2-4_marches/black_bear/black_bear.pipes.ly new file mode 100644 index 0000000..2f3f5d7 --- /dev/null +++ b/fullscores/2-4_marches/black_bear/black_bear.pipes.ly @@ -0,0 +1,46 @@ +\include "bagpipe_new.ly" +pipes = { + + + \time 2/4 + \bagpipeKey + \quarterBeaming + + % Part 1 + \repeat volta 2 { + \partial 8 \grg a16. [ b32 ] | + \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | + \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | + \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | + \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 ] \grg c32 [ \grd a16. ] | + + \break + + \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | + \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | + \dble e8 [ \grip e8 ] \grg e16. [ g32 ] \grA f32 [ e16. ] | + \thrwd d8 [ \grg f8 ] \thrwd d8 + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + e8 | + \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | + \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | + \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | + \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | + + \break + + A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] | + \grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] | + \grg d32 [ f16. ] \grg d32 [ f16. ] e16. [ g32 ] \grA f32 [ g16. ] | + A8 [ \grip A8 ] \grg A16. [ g32 f16. ] e32 ] \bar ".|" + } +\header { + title = "The Black Bear Hornpipe" + meter = "March" + arranger = "Trad." + instrument = "Bagpipes" +} \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.snare.ly b/fullscores/2-4_marches/black_bear/black_bear.snare.ly new file mode 100644 index 0000000..4fa2752 --- /dev/null +++ b/fullscores/2-4_marches/black_bear/black_bear.snare.ly @@ -0,0 +1,48 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +snare = { + + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + \break + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 + + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + d8 + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + \break + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) \bar "|." + + }% End of drums % + + +\header { + title = "Black Bear" + meter = "March" + composer = "E.T. de Boone, 2015" + instrument = "Snare" +} \ No newline at end of file From c85b87dd41777f6cceebef31906208251b355426 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Sat, 28 Mar 2015 10:13:02 +0100 Subject: [PATCH 13/33] Typo in Alexander MacKenzie Added Swiss Ruff Put Flams/Drags/Ruffs style in own command, instead of relying on {start|stop}GraceMusic --- .gitignore | 6 +++ airs/alexander_mackenzie.ly | 4 +- lilydrum.ly | 76 ++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fbf238f --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.ps +*.pdf +*.png +*.log +bwwtolily.py +_output/ diff --git a/airs/alexander_mackenzie.ly b/airs/alexander_mackenzie.ly index 2fd064d..5a54e84 100644 --- a/airs/alexander_mackenzie.ly +++ b/airs/alexander_mackenzie.ly @@ -28,14 +28,14 @@ % Part 2 ( Part 2.2 = Part 1) d8:32( g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> d8:32( | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | g4) \flamd d16. g32 d8:32( g8.) g16 | d4.:32( d4) d8:32( | \break g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> \flamd d16. g32 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | d4.:32( d4) diff --git a/lilydrum.ly b/lilydrum.ly index 1b3a7a6..91c7a84 100644 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -1,11 +1,11 @@ %{ LilyPond file definitions for Highland snare drum scores. - + This file was first created by Simon Froger. Include by using : \include "[path]/lilydrum.ly" - + Music has to be put into : \new DrumStaff { \drummode { @@ -37,7 +37,7 @@ drumPitchNames = indent = 0 % rolls number : markups should be preceeded by \textLengthOn - + % dynamics up \dynamicUp \set DrumStaff.drumStyleTable = #(alist->hash-table pipebandsnaredrums) @@ -48,20 +48,20 @@ drumPitchNames = % bar line length \override BarLine.bar-extent = #'(-2 . 2) % stems - \override Stem.direction = #-1 % stems down + \override Stem.direction = #-1 % stems down \override Stem.length = #11 % unbeamed stems lenght - \override Stem.stemlet-length = #1.5 % short stem length + \override Stem.stemlet-length = #1.5 % short stem length % beam at same height \override Beam.positions = #'(-5.5 . -5.5) - % slurs below rolls number + % slurs below rolls number \override TextScript.outside-staff-priority = ##f \override TextScript.side-axis = #0 \override TextScript.staff-padding = #3 \override TextScript.X-offset = #2 % padding to stems \override TextScript.extra-offset = #'(-0.3 . 0) % tremolos (rolls) - \override StemTremolo.slope = #0.5 % slope - \override StemTremolo.beam-width = #1.5 % beam-width + \override StemTremolo.slope = #0.5 % slope + \override StemTremolo.beam-width = #1.5 % beam-width \override StemTremolo.beam-thickness = #0.3 % beam-thickness \override StemTremolo.extra-offset = #'(0 . 0.6) % vertical pos. position %\override StemTremolo.Y-offset = #-3.3 @@ -84,7 +84,7 @@ v = #(define-event-function (parser location) () #{ \upbow #} ) -% repeat brackets +% repeat brackets dr = #(define-event-function (parser location) () #{ \startGroup #} ) @@ -93,7 +93,7 @@ fr = #(define-event-function (parser location) () ) -% dynamics with extended lines +% dynamics with extended lines dynLine = #(define-music-function (parser location text) (markup?) @@ -108,34 +108,42 @@ dynLine = #(define-music-function \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } #}) -% grace notes -startGraceMusic = { - \stemUp \tiny - \override Flag.stroke-style = #"grace" - \once \override Beam.positions = #'(3 . 3) - \once \override DrumStaff.Stem.length = #7 -} - -stopGraceMusic = { +% ================================================= +% Flams, Drags & the sort +% ================================================= +drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ + \stemUp + \override Flag.stroke-style = #"grace" + \once \override Beam.positions = #'(3 . 3) + \once \override DrumStaff.Stem.length = #7 + \override Score.GraceSpacing #'spacing-increment = #0 + \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) + \tiny \grace $notes \normalsize + \revert Score.Stem #'beamlet-default-length \revert Flag.stroke-style - \normalsize \stemNeutral -} +#}) -% Flams -flamd = \drummode { \grace { g8 } } % right Flam -flamddr = \drummode { \grace { g8\startGroup } } % with start repeat -flamg = \drummode { \grace { d8 } } % left Flam -flamgdr = \drummode { \grace { d8\startGroup } } % with start repeat +% Flams +flamd = \drummode { \drumgrace { g8 } } % right Flam +flamddr = \drummode { \drumgrace { g8\startGroup } } % with start repeat +flamg = \drummode { \drumgrace { d8 } } % left Flam +flamgdr = \drummode { \drumgrace { d8\startGroup } } % with start repeat % Drags -dragd = \drummode { \grace{ g16[ g] }} % right Drag -dragddr = \drummode { \grace{ g16[\startGroup g] }} % with start repeat -dragg = \drummode { \grace{ d16[ d] }} % left Drag -draggdr = \drummode { \grace{ d16[\startGroup d] }} % with start repeat +dragd = \drummode { \drumgrace{ g16[ g] }} % right Drag +dragddr = \drummode { \drumgrace{ g16[\startGroup g] }} % with start repeat +dragg = \drummode { \drumgrace{ d16[ d] }} % left Drag +draggdr = \drummode { \drumgrace{ d16[\startGroup d] }} % with start repeat % Ruff -ruffg = \drummode { \grace{ g16[ d g] }} % left Ruff -ruffgdr = \drummode { \grace{ g16[\startGroup d g] }} % with start repeat -ruffd = \drummode { \grace{ d16[ g d] }} % right Ruff -ruffd = \drummode { \grace{ d16[\startGroup g d] }} % with start repeat +ruffg = \drummode { \drumgrace{ g16[ d g] }} % left Ruff +ruffgdr = \drummode { \drumgrace{ g16[\startGroup d g] }} % with start repeat +ruffd = \drummode { \drumgrace{ d16[ g d] }} % right Ruff +ruffd = \drummode { \drumgrace{ d16[\startGroup g d] }} % with start repeat + +% Swiss Ruff +sruffg = \drummode { \drumgrace{ g16[ d d] }} % left Swiss Ruff +sruffgdr = \drummode { \drumgrace{ g16[\startGroup d d] }} % with start repeat +sruffd = \drummode { \drumgrace{ d16[ g g] }} % right Swiss Ruff +sruffd = \drummode { \drumgrace{ d16[\startGroup g g] }} % with start repeat From 895cade5727a94ae121f50cae082e86d411489ba Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 7 Aug 2015 00:05:35 +0200 Subject: [PATCH 14/33] Added various tunes Added a TODO list Added support for backsticking and crosssticking --- .gitignore | 1 + 2-4_marches/black_bear.side.ly | 50 +++++ 2-4_marches/duncan_mcinness.side.ly | 97 +++++++++ 2-4_marches/mackenzie_highlanders.side.ly | 54 +++++ .../on_the_road_to_passchendaele.side.ly | 44 ++++ 4-4_marches/51st_highland_division.side.ly | 54 +++++ 4-4_marches/flett_from_flotta.side.ly | 43 ++++ 4-4_marches/minstrel_boy.side.ly | 55 +++++ 4-4_marches/rowan_tree.ly | 33 +++ 4-4_marches/rowan_tree.side.ly | 38 ++++ 4-4_marches/scotland_the_brave.ly | 36 ++++ 4-4_marches/scotland_the_brave.side.ly | 34 +++ 4-4_marches/the_leaving_of_liverpool.side.ly | 46 +++++ 4-4_marches/the_pikemans_march.side.ly | 51 +++++ 4-4_marches/wings.side.ly | 53 +++++ 6-8_marches/hills_of_glenorchy.snare.ly | 49 +++++ README.md | 0 TODO | 15 ++ airs/alexander_mackenzie.side.ly | 65 ++++++ airs/amazing_grace.side.ly | 48 +++++ airs/farewell_to_camraw.side.ly | 31 +++ airs/loch_duich.side.ly | 63 ++++++ airs/miss_kirkwood.side.ly | 40 ++++ airs/morag_of_dunvegan.side.ly | 40 ++++ airs/my_home.side.ly | 39 ++++ airs/the_mist_covered_mountains.side.ly | 40 ++++ cleanpdfs | 6 + example.ly | 7 +- fullscores/template.ly | 95 +++++++++ hornpipes/itchy_fingers.side.ly | 61 ++++++ jigs/seaforth_sticks.side.ly | 149 +++++++++++++ lilydrum.ly | 195 +++++++++++++----- standards/24_standards.side.ly | 71 +++++++ standards/34_standards1.side.ly | 61 ++++++ standards/34_standards2.side.ly | 57 +++++ standards/34_standards3.side.ly | 61 ++++++ standards/44_standards.side.ly | 89 ++++++++ standards/68_standards.side.ly | 88 ++++++++ standards/standards.bass.ly | 78 +++++++ standards/standards.tenor.ly | 77 +++++++ strathspeys/aa_camerons.snare.ly | 48 +++++ strathspeys/molly_connell.bass.ly | 31 +++ strathspeys/molly_connell.side.ly | 41 ++++ strathspeys/molly_connell.tenor.ly | 36 ++++ 44 files changed, 2311 insertions(+), 59 deletions(-) mode change 100644 => 100755 .gitignore create mode 100755 2-4_marches/black_bear.side.ly create mode 100755 2-4_marches/duncan_mcinness.side.ly create mode 100755 2-4_marches/mackenzie_highlanders.side.ly create mode 100755 3-4_marches/on_the_road_to_passchendaele.side.ly create mode 100755 4-4_marches/51st_highland_division.side.ly create mode 100755 4-4_marches/flett_from_flotta.side.ly create mode 100755 4-4_marches/minstrel_boy.side.ly create mode 100644 4-4_marches/rowan_tree.ly create mode 100755 4-4_marches/rowan_tree.side.ly create mode 100644 4-4_marches/scotland_the_brave.ly create mode 100755 4-4_marches/scotland_the_brave.side.ly create mode 100755 4-4_marches/the_leaving_of_liverpool.side.ly create mode 100755 4-4_marches/the_pikemans_march.side.ly create mode 100755 4-4_marches/wings.side.ly create mode 100755 6-8_marches/hills_of_glenorchy.snare.ly mode change 100644 => 100755 README.md create mode 100755 TODO create mode 100755 airs/alexander_mackenzie.side.ly create mode 100755 airs/amazing_grace.side.ly create mode 100755 airs/farewell_to_camraw.side.ly create mode 100755 airs/loch_duich.side.ly create mode 100755 airs/miss_kirkwood.side.ly create mode 100755 airs/morag_of_dunvegan.side.ly create mode 100755 airs/my_home.side.ly create mode 100755 airs/the_mist_covered_mountains.side.ly create mode 100755 cleanpdfs mode change 100644 => 100755 example.ly create mode 100755 fullscores/template.ly create mode 100755 hornpipes/itchy_fingers.side.ly create mode 100755 jigs/seaforth_sticks.side.ly mode change 100644 => 100755 lilydrum.ly create mode 100755 standards/24_standards.side.ly create mode 100755 standards/34_standards1.side.ly create mode 100755 standards/34_standards2.side.ly create mode 100755 standards/34_standards3.side.ly create mode 100755 standards/44_standards.side.ly create mode 100755 standards/68_standards.side.ly create mode 100755 standards/standards.bass.ly create mode 100755 standards/standards.tenor.ly create mode 100755 strathspeys/aa_camerons.snare.ly create mode 100755 strathspeys/molly_connell.bass.ly create mode 100755 strathspeys/molly_connell.side.ly create mode 100755 strathspeys/molly_connell.tenor.ly diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index fbf238f..b7f1aa7 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.pdf *.png *.log +*tmp* bwwtolily.py _output/ diff --git a/2-4_marches/black_bear.side.ly b/2-4_marches/black_bear.side.ly new file mode 100755 index 0000000..feb177b --- /dev/null +++ b/2-4_marches/black_bear.side.ly @@ -0,0 +1,50 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + \break + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 + + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + d8 + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + \break + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) \bar "|." + + }% End of drums % + + \header { + title = "Black Bear" + meter = "March" + composer = "E.T. de Boone, 2015" + instrument = "Side" + } +} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness.side.ly b/2-4_marches/duncan_mcinness.side.ly new file mode 100755 index 0000000..68cda82 --- /dev/null +++ b/2-4_marches/duncan_mcinness.side.ly @@ -0,0 +1,97 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + \repeat volta 2{ + \partial 8 d8:32( | + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 r16. g32 | + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8:32( g8) | + + \flamd d8. d16 \flamg g16 r16 g16 \flamd d16 | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8. g16 | + + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2 { + \partial 8 d16. g32 | + d8:32( g8:32)( d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + } + \alternative { + { + d8:32( g8:32)( d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) + \break + } + << + { + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g4) + \bar "|." + } + \new DrumStaff{ + \once \omit Staff.TimeSignature + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g16.) d32:128( d16.) g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | + \flamd d8 d8:32( g4) + } + >> + } + }% End of drums % + + \header { + title = "Duncan McInness" + meter = "Drum Salute in Quick Time" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly new file mode 100755 index 0000000..f3775aa --- /dev/null +++ b/2-4_marches/mackenzie_highlanders.side.ly @@ -0,0 +1,54 @@ +\version "2.18.2" + + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 2/4 + \eighthBeaming + + \drummode { + \repeat volta 2{ + \partial 8 d8:32( | + g8) \tuplet 3/2 { d16 g d } \flamg g16. d32-> g16. g32 | + \flamd d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + \flamg g8[ \dragd d16. d32]-> g16.[ \dragd d32 d16. g32] | + d4:32( d8) d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flamg g16. d32-> g16. g32 | + \flamd d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + + \flamg g8-> \tuplet 3/2 { \flamd d16 g d-> } g16. g32 \flamd d8 | + d4:32( d8) + } + \break + \repeat volta 2{ + \partial 8 g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 | + d4:32( d8) g8 | + + d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + \flamg g8-> \tuplet 3/2 { \flamd d16 g d-> } g16. g32 \flamd d8 | + d4:32( d8) + } + } + } + +} + + \header { + title = "MacKenzie Highlanders" + meter = "March" + } \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele.side.ly b/3-4_marches/on_the_road_to_passchendaele.side.ly new file mode 100755 index 0000000..4e4f6ce --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele.side.ly @@ -0,0 +1,44 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 3/4 + \repeat volta 2{ + \flamd d8. g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | + \break + \flamd d8.^"2 of 2" g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) + } + \break + \repeat volta 2{ + d16[ \dragg g8 g16] d8:32( g8) d4:32( | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | + \break + d8.^"1 of 2" g16 d8:32( g8) d4:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) + } + \break + }% End of drums % + + \header { + title = "On the Road to Passchendaele" + meter = "Retreat" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division.side.ly b/4-4_marches/51st_highland_division.side.ly new file mode 100755 index 0000000..f608998 --- /dev/null +++ b/4-4_marches/51st_highland_division.side.ly @@ -0,0 +1,54 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2 { + \partial 8 d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | + + + } + \alternative { + { + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + \flamg g4 d4:32( d4) r8 + } + { + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 + } + } + + \break + d16. g32 | + d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + + \set Timing.measureLength = #(ly:make-moment 7/8) + \flamg g4 d4:32( d4) r8 + + \break + \set Timing.measureLength = #(ly:make-moment 1/8) + d16. g32 | + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 + }% End of drums % + + +}\header { + title = "51st Highland Division" + meter = "March" + composer = "" + instrument = "Side" + } \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta.side.ly b/4-4_marches/flett_from_flotta.side.ly new file mode 100755 index 0000000..186660c --- /dev/null +++ b/4-4_marches/flett_from_flotta.side.ly @@ -0,0 +1,43 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2{ + \partial 8 d8:32( | + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32)( | + d4) d8:32(-> \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32 \flamd d8 d8:32( | + d4)-> d4:32( d4) d4:32( | + \break + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 r8| + d4:32( d8) d32 g d g d32 g d g d8 \flamg g8 d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 d4:32( g8:32)(-> d8:32)(-> | + d4) r4 r4 r4 | + d8.:32(-> g16) d8:32(-> g8)-> d32 g d g d16. g32-> r16 g16-> r16 g16-> | + \break + g8.:32(-> g16) d8:32(-> g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 + } + + }% End of drums % + + \header { + title = "Flett from Flotta" + meter = "March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy.side.ly b/4-4_marches/minstrel_boy.side.ly new file mode 100755 index 0000000..e7c0439 --- /dev/null +++ b/4-4_marches/minstrel_boy.side.ly @@ -0,0 +1,55 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 4/4 + \drummode { + \repeat volta 2{ + \partial 4 + + \dragd d16. d32-> g16. g32 | + + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + \break + d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) + } + + \break + + % Part 2 + \partial 4 + \flamd d8. d16:32( | + g16) g16 d8:32( g16) g16 d8:32( g8:32)( d8) r8 d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) + + \break + + \dragd d16. d32-> g16. g32 | + + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) + + } + } + +} + +\header { + title = "Minstrel Boy" + meter = "March" +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree.ly b/4-4_marches/rowan_tree.ly new file mode 100644 index 0000000..ecce472 --- /dev/null +++ b/4-4_marches/rowan_tree.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \partial 4 + r8 d8^"Part 2 of 2" | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + } + \break + % Part 2 ( Part 2.2 = Part 1) + d8. g16 | + d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + }% End of drums % +} + +\header { + title = "Rowan Tree" + meter = "Quick March" + composer = "" + instrument = "Side" +} diff --git a/4-4_marches/rowan_tree.side.ly b/4-4_marches/rowan_tree.side.ly new file mode 100755 index 0000000..45eb077 --- /dev/null +++ b/4-4_marches/rowan_tree.side.ly @@ -0,0 +1,38 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \partial 4 + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + } + \break + % Part 2 ( Part 2.2 = Part 1) + d8. g16 | + d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + }% End of drums % + \header { + title = "Rowan Tree" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave.ly b/4-4_marches/scotland_the_brave.ly new file mode 100644 index 0000000..a5eded7 --- /dev/null +++ b/4-4_marches/scotland_the_brave.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +#(set-default-paper-size "a4landscape") +\score { + \drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | + \flamd d4 d4:32( d4) r8 + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + g8 | + d4:32( d8) g8 d4:32( d8) g8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d4 d4:32( d4) r8 + + }% End of drums % +} + +\header { + title = "Scotland the Brave" + meter = "Quick March" + composer = "" + instrument = "Side" +} diff --git a/4-4_marches/scotland_the_brave.side.ly b/4-4_marches/scotland_the_brave.side.ly new file mode 100755 index 0000000..ac986fc --- /dev/null +++ b/4-4_marches/scotland_the_brave.side.ly @@ -0,0 +1,34 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | + \flamd d4 d4:32( d4) r8 + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + g8 | + d4:32( d8) g8 d4:32( d8) g8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d4 d4:32( d4) r8 + + }% End of drums % + \header { + title = "Scotland the Brave" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool.side.ly b/4-4_marches/the_leaving_of_liverpool.side.ly new file mode 100755 index 0000000..93fa397 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool.side.ly @@ -0,0 +1,46 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2{ + \partial 4 r8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + + \flamd d4 d4:32( d4) + } + \break + \partial 4 \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | + + \flamd d4 d4:32( d4) r8 + + \partial 4 \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | + + d4 d4:32( d4) r8 + + }% End of drums % + + \header { + title = "The Leaving of Liverpool" + meter = "March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march.side.ly b/4-4_marches/the_pikemans_march.side.ly new file mode 100755 index 0000000..9c743e5 --- /dev/null +++ b/4-4_marches/the_pikemans_march.side.ly @@ -0,0 +1,51 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2 { + \partial 8 g8 | + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d4:32( d4) r8 g8 | + \break + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | + + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | + + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 + + + + + + }% End of drums % + \header { + title = "The Pikeman's March" + meter = "March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/wings.side.ly b/4-4_marches/wings.side.ly new file mode 100755 index 0000000..cd866af --- /dev/null +++ b/4-4_marches/wings.side.ly @@ -0,0 +1,53 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \partial 8 + d8:32)(^"Part 2 of 2" | + g8.) \parenthesize d16 d8:32( g8) r8 d32-> \dr g d g d-> g d g d8-> \fr | + \flamd d8 g16. d32-> g16. g32 \flamd d8 d4:32( d8) d16. g32 | + } + \alternative { + { + \break + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32( d8) \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | + \set Timing.measureLength = #(ly:make-moment 8/8) + \tuplet 3/2 { g16) d g } \flamd d8 d16. g32 \dragd d8 d32 g d g d8 d4:32( + } + { + \break + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32)( d8) \flamg g8 d32 g d g d8 d16. g32 \dragd d8 | + \set Timing.measureLength = #(ly:make-moment 7/8) + d32 g d g d8 d4:32( d4) r8 + } + } + \bar "|." + \break + % Part 2 ( Part 2.2 = Part 1) + \set Timing.measureLength = #(ly:make-moment 1/8) + d8:32( | + \set Timing.measureLength = #(ly:make-moment 4/4) + g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> g8:32)(-> | + d8.)-> g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | + \break + \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 g d } \flamg g8 | + \flamd d4 r4 d8:32(-> g8:32)(-> d8:32)(-> g8:32)(-> \bar "|." + + + }% End of drums % + + \header { + title = "Wings" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy.snare.ly b/6-8_marches/hills_of_glenorchy.snare.ly new file mode 100755 index 0000000..fe11062 --- /dev/null +++ b/6-8_marches/hills_of_glenorchy.snare.ly @@ -0,0 +1,49 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\drums { + \time 6/8 + + % Part 1 + \repeat volta 2 { + \partial 8 d8 | + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | + d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | + d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | + + \break + + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) + + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + \repeat volta 2 { + \tuplet 5/2 { d16 g d g d } | + g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | + g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 + + \break + + \flamg g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) + } +}% End of drums % + +\header { + title = "Hills of Glenorchy" + meter = "March" + composer = "G. Clark, 1977" + instrument = "Side" +} \ No newline at end of file diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/TODO b/TODO new file mode 100755 index 0000000..d7791cc --- /dev/null +++ b/TODO @@ -0,0 +1,15 @@ +TODO + * flam function : detect whether left flam or right flam. This depends on the note, whether it is right or left respectively + * show 8th and 16th beats in beaming, currently only 8ths + * include EUSPBA flourishing symbols, maybe a sprite file ?!? + * spanners (traditional and regimental spanners) + * symbols + * Very special beats (backsticking, crosssticking and the like..) + * Macros for tutti's (unisons), "Part 2 of $n", + + * Find a nice filing system for easy saving, editing, generation of the scores + *** script to easily generate the scores + should be able to generate single instrument scores aswell as full drumscores, + and possibly fullscores (with the pipetune) + from referenced files + *** templates \ No newline at end of file diff --git a/airs/alexander_mackenzie.side.ly b/airs/alexander_mackenzie.side.ly new file mode 100755 index 0000000..2fd2656 --- /dev/null +++ b/airs/alexander_mackenzie.side.ly @@ -0,0 +1,65 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + % Part 1 + \repeat volta 2 { + \partial 8 d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | + + \break + + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + + } + + \break + + % Part 2 ( Part 2.2 = Part 1) + d8:32( | + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | + g4) \flamd d16. g32 d8:32( g8.) g16 | + d4.:32( d4) d8:32( | + + \break + + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + + \break + d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | + + \break + + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) + \bar "|." + + }% End of drums % + + \header { + title = "Alexander MacKenzie" + meter = "Slow March" + composer = "E.T. de Boone, 2015" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/amazing_grace.side.ly b/airs/amazing_grace.side.ly new file mode 100755 index 0000000..81798f5 --- /dev/null +++ b/airs/amazing_grace.side.ly @@ -0,0 +1,48 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 3/4 + + \partial 4 + \flamd d8. g16 | + + \repeat volta 2{ + \flamd d2)\! \flamd d8 g16 d16 | + \flamd d2 \flamd d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | + \break + + \flamd d2 \flamd d8 g16 d16 | + \flamd d2 \flamd d8. \flamg g16-> | + d4:32(\< d4:32)( d4:32)(\> | + d4:32)(\! d4:32)( d4:32)(\< | + \break + + d2->)\! d8 g16 d16 | + \flamd d2 d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | + \break + + \flamd d2 d8 g16 d16 | + \flamd d2 \dragd d4 | + d4:32(\> d4:32)( d4:32)(\! | + d4:32)( d4:32)(\< d4:32)( + \break + \bar "||" + } + + + }% End of drums % + + \header { + title = "Amazing Grace" + meter = "Hymn" + composer = "E.T. de Boone, 2015" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw.side.ly b/airs/farewell_to_camraw.side.ly new file mode 100755 index 0000000..05d2dcf --- /dev/null +++ b/airs/farewell_to_camraw.side.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 4/4 + \drummode { + \repeat volta 2{ + r1 | + r1 | + \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | + \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | + \flamd d4 d32 g d g d g d g d4 r4 | + \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | + d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | + \flamd d8 \flamg g8 r4 r2 + } + } + } + +} + + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + } \ No newline at end of file diff --git a/airs/loch_duich.side.ly b/airs/loch_duich.side.ly new file mode 100755 index 0000000..4c0b5cd --- /dev/null +++ b/airs/loch_duich.side.ly @@ -0,0 +1,63 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + \repeat volta 2 { + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | + } + \break + \repeat volta 2 { + d4)\! g8 d8:32( d8) g8 | + d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | + + \flamg g4 g8 d8:32( d8) g8 | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | + } + \break + \repeat volta 2 { + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d8 g16 d-> g g d4.:32(\< | + + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + } + \alternative { + { + \dragd d16 d-> g g \flamd d8 d4.:32(\< | + } + { + \dragd d16)\! d-> g g \flamd d8 \flamd d4. | + } + } + }% End of drums % + + \header { + title = "Loch Duich" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/miss_kirkwood.side.ly b/airs/miss_kirkwood.side.ly new file mode 100755 index 0000000..99bf0f1 --- /dev/null +++ b/airs/miss_kirkwood.side.ly @@ -0,0 +1,40 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + \repeat volta 2 { + d4.:32( d4) g8 | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d2.:32(\< | + \break + d8)\! \flamg g8. g16 d4:32( d8) | + d8:32( d8.) g16 d4.:32( | + d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4) r8 + } + \break + \repeat volta 2 { + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | + \break + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4) r8 + } + }% End of drums % + + \header { + title = "Miss Kirkwood" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan.side.ly new file mode 100755 index 0000000..699a120 --- /dev/null +++ b/airs/morag_of_dunvegan.side.ly @@ -0,0 +1,40 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + \repeat volta 2 { + \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 r8 d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) + } + \break + \repeat volta 2 { + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) + } + }% End of drums % + + \header { + title = "Morag of Dunvegan" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/my_home.side.ly b/airs/my_home.side.ly new file mode 100755 index 0000000..66bae5c --- /dev/null +++ b/airs/my_home.side.ly @@ -0,0 +1,39 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + \repeat volta 2 { + \partial 8 d8:32( | + g8.) d16 g8 \flamd d8. g16 d8 | + \flamg g8. d16 g8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) + } + \repeat volta 2 { + \partial 8 d8 | + \flamd d8. g16 d8 d4.:32( + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d8. g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) + } + }% End of drums % + + \header { + title = "My Home" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains.side.ly new file mode 100755 index 0000000..fe8db3e --- /dev/null +++ b/airs/the_mist_covered_mountains.side.ly @@ -0,0 +1,40 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + + \repeat volta 2 { + \partial 8 d8:32( | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d8)[ r8 d8:32(] | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d4.) | + } + \break + \repeat volta 2 { + \partial 8 d8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + d2.:32( | + d8.)-> g16 d8 g8 r8 g8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + r8 g8 d8 r8 d8 g8 | + d4.:32( d4.) | + } + }% End of drums % + + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/cleanpdfs b/cleanpdfs new file mode 100755 index 0000000..c587216 --- /dev/null +++ b/cleanpdfs @@ -0,0 +1,6 @@ +#!/bin/bash +# Recursively remove all pdfs from this directory +rm -v -R *.pdf +rm -v -R /snare/*.pdf +rm -v -R /tenor/*.pdf +rm -v -R /bass/*.pdf \ No newline at end of file diff --git a/example.ly b/example.ly old mode 100644 new mode 100755 index d235e05..ff1c9f1 --- a/example.ly +++ b/example.ly @@ -1,5 +1,6 @@ +\version "2.18.2" % include the lilydrum file -include lilydrum.ly +\include "lilydrum.ly" % Now a tiny example : \score { @@ -10,7 +11,7 @@ include lilydrum.ly \repeat volta 2 { g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \fladdr d8. d16 g8 d4.:32(_"13" | + \flamddr d8. d16 g8 d4.:32(_"13" | d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | \break g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | @@ -20,4 +21,4 @@ include lilydrum.ly } } } -} +} \ No newline at end of file diff --git a/fullscores/template.ly b/fullscores/template.ly new file mode 100755 index 0000000..704b22d --- /dev/null +++ b/fullscores/template.ly @@ -0,0 +1,95 @@ +\version "2.19.22" + +print_pipes = #f +print_snare = #f +print_tenor = #f +print_bass = #f + +file_pipes = "Pipes" +file_snare = "Snare" +file_tenor = "Tenor" +file_bass = "Bass" + +composer_pipes = "Trad." +composer_snare = "Dean Hall, 1999" +composer_tenor = "Dean Hall, 1999" +composer_bass = "Dean Hall, 1999" + + +%=======================================% +% You should not have to touch below % +%=======================================% + +\include "bagpipe.ly" +\include "lilydrum.ly" + +#(if (\print_pipes) (music_pipes = \include \file_pipes)) +#(if (\print_snare) (music_snare = \include \file_snare)) +#(if (\print_tenor) (music_tenor = \include \file_tenor)) +#(if (\print_bass) (music_bass = \include \file_bass )) + +#(ly:set-option 'point-and-click #f) +\paper{ + ragged-bottom = ##t +} + +\score { + { + << + #(if (\print_pipes) ( + \new Staff = "staff_pipes" { + \set Staff.instrumentName = #"Pipes" + \set Staff.shortInstrumentName = #"P." + + \music_pipes + } + )) + #(if (\print_snare) ( + \new DrumStaff = "staff_snare" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Snare" + \set Staff.shortInstrumentName = #"S.D." + + \music_snare + } + )) + #(if (\print_tenor) ( + \new DrumStaff = "staff_tenor" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Tenor" + \set Staff.shortInstrumentName = #"T.D." + + \music_tenor + } + )) + #(if (\print_bass) ( + \new DrumStaff = "staff_bass" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Bass" + \set Staff.shortInstrumentName = #"B.D." + + \music_bass + } + )) + >> + } +} +\header { + title = "Title" + meter = "Meter" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + + composer = \markup { + \column { + #(if (\print_pipes) (\line{Pipes: \composer_pipes})) + #(if (\print_snare) (\line{Snare: \composer_snare})) + #(if (\print_tenor) (\line{Tenor: \composer_tenor})) + #(if (\print_bass ) (\line{Bass: \composer_bass} )) + } + } + arranger = "Arranger" + % The following fields are centered at the bottom + tagline = "tagline goes at the bottom of the last page" + copyright = "copyright goes at the bottom of the first page" +} \ No newline at end of file diff --git a/hornpipes/itchy_fingers.side.ly b/hornpipes/itchy_fingers.side.ly new file mode 100755 index 0000000..dc0914f --- /dev/null +++ b/hornpipes/itchy_fingers.side.ly @@ -0,0 +1,61 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + + \repeat volta 2 { + \partial 8 r8 | + \flamd d16^"2 of 2"-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> d8:32( | + + g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | + d16) g16-> d32 g d g d4:32( | + + \break + \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> + } + \break + \repeat volta 2 { + \partial 8 d16 g16 | + d32-> g d g d g d g d16-> g d d | + g32-> d g d g-> d g d g16-> d g g | + + d32-> g d g d g d-> g d g d g d8-> | + d16-> d16:64( d16) g16 d4:32(-> | + \break + } + \alternative { + { + d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | + d16 g16-> d32 g d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> + \break + } + { + d16[)-> g d \flamg g]-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> + \bar "|." + } + } + + }% End of drums % + + \header { + title = "Itchy Fingers" + meter = "Hornpipe" + composer = "Dean Hall, 1995" + instrument = "Side" + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks.side.ly b/jigs/seaforth_sticks.side.ly new file mode 100755 index 0000000..4b37f4d --- /dev/null +++ b/jigs/seaforth_sticks.side.ly @@ -0,0 +1,149 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 6/8 + \drummode { + \repeat volta 2{ + \partial 8 r8^"A" | + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) + } + \break + % B + \repeat volta 2{ + \partial 8 g8^"B" | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ g8 | + + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) + } + \break + % C + \repeat volta 2{ + \partial 8 d8:32(^"C" | + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | + + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) + } + \break + % D + \repeat volta 2{ + \partial 8 g8^"D" | + d4.:32(-> g8) d8 g8| + d4.:32(-> g8) d8 g8| + + \flamd d8 g8 g8 \flamg g4 g8-^ | + d8 g8 \flamg g8-^ \flamg g4 g8 | + + d4.:32(-> g8) d8 g8| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) + } + + \break + %E + \repeat volta 2{ + \partial 8 r8^"E" | + \flamd d8 g8 d8 dback4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 dback4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 dback4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 dback4 g8 | + d4.:32( d4.) + } + \break + % F + \repeat volta 2{ + \partial 8 g8^"F" | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8^"Y" d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | + \flamd d8 g8 d8 dback4 g8 | + + d4.:32(-> d8) g8 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> db4 g8 | + d4.:32( d4.) + } + \break + % G + \repeat volta 2{ + \partial 8 d8:32(^"C" | + d4)-^ dback8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8 g8 d8 gback8 d8 g8 | + \flamd d8 g8 g8 dback4 d8:32( | + + d4)-> dback8 g8 d8 g8| + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g d8-> gback8 d8 g8 | + d4.:32( d4.) + } + \break + % H + \repeat volta 2{ + \partial 8 g8^"H" | + \flamd d8 d16 g16 d8 g8^"X" d8^"X" g8^"X"| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 dback4 g8 | + + \flamd d8 d16 g16 d8 g8^"X" d8^"X" g8^"X"| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flam d8 g8 d8 dback4 g8 | + d4.:32( d4.) + } + + } + } + +} + +\header { + title = "Seaforth Sticks" + meter = "Jig" +} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly old mode 100644 new mode 100755 index 91c7a84..999d1c3 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -1,7 +1,11 @@ +\version "2.16.2" %{ - LilyPond file definitions for Highland snare drum scores. + LilyPond file definitions for Pipeband drumming scores. + Primarily focused on Snare drumming, + occasional bass or tenor scores should be possible. + Especially with the use of an external eps file with flourishi symbols - This file was first created by Simon Froger. + This file builds on work done by Simon Froger. Include by using : \include "[path]/lilydrum.ly" @@ -15,70 +19,138 @@ %} +% Note name defs : +% "d" for the right hand ("droite") and +% "g" for the left hand ("gauche") -% Note names defs : "d" for the right hand and "g" for the left hand drumPitchNames = #(append '( (d . right-hand) (g . left-hand) + (right . right-hand) + (left . left-hand) + + (dback . right-backstick) + (gback . left-backstick) + (rightback . right-backstick) + (leftback . left-backstick) + + (dcross . right-crossstick) + (gcross . right-crossstick) + (rightcross . right-crossstick) + (leftcross . right-crossstick) ) drumPitchNames ) -% position according to the line : right hand up and left hand down -#(define pipebandsnaredrums '( - (right-hand default #f 1) - (left-hand default #f -1)) +% Position according to the line : right hand above and left hand below +#(define pipeband-style '( + (right-hand () #f 1) + (left-hand () #f -1) + (right-backstick cross #f 1) + (left-backstick cross #f -1) + (right-backstick xcircle #f 1) + (left-backstick xcircle #f -1) + ) ) +% Built-in noteheads: default, cross, xcircle, diamond -% Layout tweaks for good defaults +% =================================================== % +% Layout tweaks for good defaults % +% =================================================== % \layout { - % no indent - indent = 0 - % rolls number : markups should be preceeded by - \textLengthOn - - % dynamics up - \dynamicUp - \set DrumStaff.drumStyleTable = #(alist->hash-table pipebandsnaredrums) \context { \DrumStaff + + % add hands to note definitions + drumStyleTable = #(alist->hash-table pipeband-style) + % one line per staff \override StaffSymbol.line-positions = #'(0) - % bar line length - \override BarLine.bar-extent = #'(-2 . 2) + % stems - \override Stem.direction = #-1 % stems down - \override Stem.length = #11 % unbeamed stems lenght - \override Stem.stemlet-length = #1.5 % short stem length - % beam at same height - \override Beam.positions = #'(-5.5 . -5.5) + \override Stem.direction = #DOWN % stems down + \override Stem.length = #9 % unbeamed stems length + \override Stem.stemlet-length = #1.5 % short stem length + + % beams + \override Beam.beam-thickness = #0.4 % beam-thickness + \override Beam.positions = #'(-3.8 . -3.8) % fix beams on one height + + % slurs and ties + \override Slur.direction = #UP % Slurs on top + \override Tie.direction = #UP % Ties on top + + % dynamics up + \dynamicUp + + + % slurs below rolls number - \override TextScript.outside-staff-priority = ##f - \override TextScript.side-axis = #0 - \override TextScript.staff-padding = #3 - \override TextScript.X-offset = #2 % padding to stems - \override TextScript.extra-offset = #'(-0.3 . 0) + %\override TextScript.outside-staff-priority = ##f + %\override TextScript.side-axis = #0 + %\override TextScript.staff-padding = #3 + %\override TextScript.X-offset = #2 % padding to stems + %\override TextScript.extra-offset = #'(-0.3 . 0) + % tremolos (rolls) - \override StemTremolo.slope = #0.5 % slope - \override StemTremolo.beam-width = #1.5 % beam-width - \override StemTremolo.beam-thickness = #0.3 % beam-thickness - \override StemTremolo.extra-offset = #'(0 . 0.6) % vertical pos. position - %\override StemTremolo.Y-offset = #-3.3 + \override StemTremolo.slope = #0.5 % slope + \override StemTremolo.beam-width = #1.5 % beam-width + \override StemTremolo.beam-thickness = #0.3 % beam-thickness + \override StemTremolo.extra-offset = #'(0 . 0.3) % vertical pos. position + + %\override StemTremolo.Y-offset = #-2.8 + % repeat brackets - \consists "Horizontal_bracket_engraver" - \override HorizontalBracket.staff-padding = #6.5 % staff-padding - \override HorizontalBracket.direction = #DOWN % brackets under thr staff - \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets + %\consists "Horizontal_bracket_engraver" + %\override HorizontalBracket.staff-padding = #6.5 % staff-padding + %\override HorizontalBracket.direction = #DOWN % brackets under thr staff + %\override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets + } \context { \Score + \override RehearsalMark.break-align-symbols = #'(clef) \override RehearsalMark.padding = #3 \override VoltaBracket.edge-height = #'(1.5 . 1.5) } } +% =================================================== % +% Define some tweaks for printing nicely % +% =================================================== %\ + + +eighthBeaming = { + \set Score.baseMoment = #(ly:make-moment 1 8) + \set Score.beatStructure = #'( 2 ) +} +sixteenthBeaming = { + \set Score.baseMoment = #(ly:make-moment 1 16) + \set Score.beatStructure = #'( 2 2 ) +} + +\layout{ + % no indent + indent = 0 + \context{ + \DrumStaff + % always numeric Time Signatures + \numericTimeSignature + + % bar line height + \override BarLine.bar-extent = #'(-2 . 2) + + % I like being able to identify the 8th notes + subdivideBeams = ##t + } +} + +% ================================================= % +% Functions % +% ================================================= % + % dynamics v = #(define-event-function (parser location) () #{ \upbow #} @@ -92,7 +164,6 @@ fr = #(define-event-function (parser location) () #{ \stopGroup #} ) - % dynamics with extended lines dynLine = #(define-music-function (parser location text) @@ -108,14 +179,14 @@ dynLine = #(define-music-function \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } #}) -% ================================================= -% Flams, Drags & the sort -% ================================================= +% ================================================= % +% Flams, Drags & the sort % +% ================================================= % drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ \stemUp \override Flag.stroke-style = #"grace" - \once \override Beam.positions = #'(3 . 3) - \once \override DrumStaff.Stem.length = #7 + \once \override Beam.positions = #'(2 . 2) + \once \override DrumStaff.Stem.length = #6 \override Score.GraceSpacing #'spacing-increment = #0 \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) \tiny \grace $notes \normalsize @@ -124,26 +195,38 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ \stemNeutral #}) + % Flams -flamd = \drummode { \drumgrace { g8 } } % right Flam +flamd = \drummode { \drumgrace { g8 } } % right Flam, actually flam(left) note(right) flamddr = \drummode { \drumgrace { g8\startGroup } } % with start repeat flamg = \drummode { \drumgrace { d8 } } % left Flam flamgdr = \drummode { \drumgrace { d8\startGroup } } % with start repeat % Drags -dragd = \drummode { \drumgrace{ g16[ g] }} % right Drag -dragddr = \drummode { \drumgrace{ g16[\startGroup g] }} % with start repeat -dragg = \drummode { \drumgrace{ d16[ d] }} % left Drag -draggdr = \drummode { \drumgrace{ d16[\startGroup d] }} % with start repeat +dragd = \drummode { \drumgrace { g16[ g] }} % right Drag +dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % with start repeat +dragg = \drummode { \drumgrace { d16[ d] }} % left Drag +draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % with start repeat % Ruff -ruffg = \drummode { \drumgrace{ g16[ d g] }} % left Ruff -ruffgdr = \drummode { \drumgrace{ g16[\startGroup d g] }} % with start repeat -ruffd = \drummode { \drumgrace{ d16[ g d] }} % right Ruff -ruffd = \drummode { \drumgrace{ d16[\startGroup g d] }} % with start repeat +ruffg = \drummode { \drumgrace { g16[ d g] }} % left Ruff +ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % with start repeat +ruffd = \drummode { \drumgrace { d16[ g d] }} % right Ruff +ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % with start repeat % Swiss Ruff -sruffg = \drummode { \drumgrace{ g16[ d d] }} % left Swiss Ruff -sruffgdr = \drummode { \drumgrace{ g16[\startGroup d d] }} % with start repeat -sruffd = \drummode { \drumgrace{ d16[ g g] }} % right Swiss Ruff -sruffd = \drummode { \drumgrace{ d16[\startGroup g g] }} % with start repeat +sruffg = \drummode { \drumgrace { g16[ d d] }} % left Swiss Ruff +sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % with start repeat +sruffd = \drummode { \drumgrace { d16[ g g] }} % right Swiss Ruff +sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % with start repeat + + +flam = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + + #(if #f \flamg ($\flamd)) % fix \flam{gd} return + + % print the note, else it won't show up + $note +#}) \ No newline at end of file diff --git a/standards/24_standards.side.ly b/standards/24_standards.side.ly new file mode 100755 index 0000000..041e1ff --- /dev/null +++ b/standards/24_standards.side.ly @@ -0,0 +1,71 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + % LINE 4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + + }% End of drums % + + \header { + title = "2/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards1.side.ly b/standards/34_standards1.side.ly new file mode 100755 index 0000000..0650fe6 --- /dev/null +++ b/standards/34_standards1.side.ly @@ -0,0 +1,61 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 3/4 + \repeat volta 2{ + \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 + \flamd d4 d4:32( d4) + } + }% End of drums % + + \header { + title = "3/4 Standards\nSetting 1" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards2.side.ly b/standards/34_standards2.side.ly new file mode 100755 index 0000000..3fa339c --- /dev/null +++ b/standards/34_standards2.side.ly @@ -0,0 +1,57 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 3/4 + \repeat volta 2{ + d4:32(-> d8) d8:32(-> d4) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + d4:32(-> d8) d8:32(-> d4) | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + d4:32( g8) d8:32( g8) g8 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + d4:32( g8) d8:32( g8) g8 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d4 d4:32( d4) + } + }% End of drums % + + \header { + title = "3/4 Standards\n Setting 2" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards3.side.ly b/standards/34_standards3.side.ly new file mode 100755 index 0000000..b8cb71e --- /dev/null +++ b/standards/34_standards3.side.ly @@ -0,0 +1,61 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 3/4 + \repeat volta 2{ + \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | + d8) d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | + d4) d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamg g8 d16 d d d | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamg g8 d16 d d d + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d4 d4:32( d4) + } + }% End of drums % + + \header { + title = "3/4 Standards\n Setting 3" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly new file mode 100755 index 0000000..704b158 --- /dev/null +++ b/standards/44_standards.side.ly @@ -0,0 +1,89 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 2/4 + + \repeat volta 2{ + \partial 8 r8 | + R1 | + r4 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | + d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + R1 | + r4 r8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + }% End of drums % + + \header { + title = "2/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} +\score { + \drums { + \time 4/4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8 | + \flamd d4 d4:32( d4) r8 + } + \break + % LINE 4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + + }% End of drums % + + \header { + title = "4/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly new file mode 100755 index 0000000..0774057 --- /dev/null +++ b/standards/68_standards.side.ly @@ -0,0 +1,88 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 6/8 + \repeat volta 2{ + \partial 8 g8 | + \flamd d4 d8:32( g4) d8:32( | + g8.) g16 d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d4 d8:32( g4) d8:32( | + g8.) g16 d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d8:32( d8) g8 d8:32( d8) g8 | + \flamd d8 d8:32( d8) d8:32( d8) g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8:32( d8) g8 d8:32( d8) g8 | + \flamd d8 d8:32( d8) d8:32( d8) g8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d4.:32(\< d4.:32)( | + d8.)\! g16 d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d4.:32(\< d4.:32)( | + d8.)\! g16 d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 d8:32( | + g8.) g16 \flamd d8 d8. d16 \flamg g8 | + d8. g16 \flamd d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8:32( | + g8.) g16 \flamd d8 d8. d16 \flamg g8 | + d8. g16 \flamd d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 d8:32( | + \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | + \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 d8:32( | + \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | + \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d4.:32(\< d4.:32)( | + d16)\!\< g d g d8\! \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d4.:32(\< d4.:32)( | + d16)\!\< g d g d8\! \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + }% End of drums % + + \header { + title = "6/8 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly new file mode 100755 index 0000000..c5202ea --- /dev/null +++ b/standards/standards.bass.ly @@ -0,0 +1,78 @@ +\version "2.18.2" + +\include "lilydrum2.ly" + +\header { + meter = "March" + instrument = "Bass" +} + +\markup "2/4 Standards" +\score { + \new DrumStaff { + \time 2/4 + \repeat volta 2 { + \repeat unfold 8 { d4-> g4 } + } + } + + \header { + title = "2/4 Standards" + } +} + +\markup "3/4 Standards" +\score { + \new DrumStaff { + \time 3/4 + + \repeat volta 2 { + \repeat unfold 4 { d4-> g4 d4 } + } + } + + \header { + title = "3/4 Standards" + } +} + +\markup "4/4 Standards" +\score { + \new DrumStaff { + \time 4/4 + \numericTimeSignature + + \repeat volta 2 { + \repeat unfold 3 { d4-^ g4 d4-> g4 } + d4-^ g4 d4 r4 | + } + } + + \header { + title = "4/4 Standards" + } +} + +\markup "6/8 Standards" +\score { + \new DrumStaff { + \time 6/8 + + % Part 1 + \repeat volta 2 { + d4. g4. | + d4. r4. | + d4. g4. | + d4. r4 g8 | + d4. g4. | + d4. r4. | + d4. g4. | + d4. r4. | + + } + } + + \header { + title = "6/8 Standards" + } +} \ No newline at end of file diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly new file mode 100755 index 0000000..8b8ed58 --- /dev/null +++ b/standards/standards.tenor.ly @@ -0,0 +1,77 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\header { + meter = "March" + instrument = "Tenor" +} + +\markup "2/4 Standards" +\score { + \drums { + \time 2/4 + \repeat unfold 8 { d8-> g8 d8 g8 } + \break + \repeat unfold 8 { d4 g4} + } + + \header { + title = "2/4 Standards" + } +} + +\markup "3/4 Standards" +\score { + \drums { + \time 3/4 + + \repeat volta 2 { + \repeat unfold 4 { d4-> g4 d4 } + } + } + + \header { + title = "3/4 Standards" + } +} + +\markup "4/4 Standards" +\score { + \drums { + \time 4/4 + + \repeat volta 2 { + \repeat unfold 3 { d8[-^ g8] d8[ g8] d8[-> g8] d8[ g8] } + d4-^ g4 d4 r4 | + } + } + + \header { + title = "4/4 Standards" + } +} + +\markup "6/8 Standards" +\score { + \drums { + \time 6/8 + + % Part 1 + \repeat volta 2 { + d4. g4. | + d4. r4. | + d4. g4. | + d4. r4 g8 | + d4. g4. | + d4. r4. | + d4. g4. | + d4. r4. | + + } + } + + \header { + title = "6/8 Standards" + } +} \ No newline at end of file diff --git a/strathspeys/aa_camerons.snare.ly b/strathspeys/aa_camerons.snare.ly new file mode 100755 index 0000000..80cd5b7 --- /dev/null +++ b/strathspeys/aa_camerons.snare.ly @@ -0,0 +1,48 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\drums { + \time 4/4 + + % Part 1 + \repeat volta 2 { + \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> | + d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } | + } + \alternative { + { + g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | + \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } + } + { + g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | + \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } + } + } + + \break + + % Part 2 + \repeat volta 2 { + d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | + d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | + } + \alternative { + { + \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | + g8. d16 \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } + } + { + \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | + d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } + } + } +}% End of drums % + +\header { + title = "A. A. Cameron's Strathspey" + meter = "Strathspey" + composer = "G. Clark, 1988" + instrument = "Side" +} \ No newline at end of file diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly new file mode 100755 index 0000000..b21417b --- /dev/null +++ b/strathspeys/molly_connell.bass.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \numericTimeSignature + \time 4/4 + + % Part 1 + \repeat volta 2 { + d4-> g4-> d4 g4 | + d4 g4 d4 g4 | + d4-> g4 d4 g4 | + d4-> g4 d8.-> g16 d4 | + + \break + d4-> g4-> d4 g4 | + r8 d8 r8 g8 r8 d8 r8 g8 | + d4-> g4 d4 g4 | + d4-> g4 r8. g16 d4 | + + } + } + header { + title = "Molly Connell" + composer = "W.H. de Boone / E.T. de Boone, 2014" + instrument = "Bass Drum" + meter = "STRATHSPEY" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell.side.ly b/strathspeys/molly_connell.side.ly new file mode 100755 index 0000000..64c02b7 --- /dev/null +++ b/strathspeys/molly_connell.side.ly @@ -0,0 +1,41 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2 { + \partial 8 r8 + \flamd d4 \flamg g8.[ d16:64(] d8.[) \dragg g16] d8.[ g16] | + d8.:64[( g16]) \tuplet 3/2 { d16[ g d g d8]} \tuplet 3/2 { g8[ d8 \flamg g8] } \flamd d8.[ g16] | + + d16:64[( d8.]) g8.[ \dragd d16] \tuplet 3/2 { d16[ g d g d8] } g8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 + } + \break + \partial 8 g8 | + d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | + \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | + + \tuplet 3/2 { \flamd d8[ g16 g16 d8] } g8.[ g16] \tuplet 3/2 { d8[ g16 g16 d8] } g8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | + \break + \partial 8 g8 | + d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | + \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | + + \flamd d4 \flamg g8.[ d16:64]( d8.[) \dragg g16] d8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | + + \bar "|." + }% End of drums % + + \header { + title = "Molly Connell" + meter = "Strathspey" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly new file mode 100755 index 0000000..449a27f --- /dev/null +++ b/strathspeys/molly_connell.tenor.ly @@ -0,0 +1,36 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \drums { + \time 4/4 + + \repeat volta 2 { + d4 g4 d8. g16 d4 + d4 g4 r8. g16 d4 + d4 d4 g4 g4 + d4 g4 d4 g4 + } + \break + d4 g4 d4 g4 + d4 d8. g16 r8. g16 d4 + d4 g4 d8. g16 d4 + d4 g4 d4 g4 + + \break + d4 g4 d4 g4 + d4 d8. g16 r8. g16 d4 + d4 d4 g4 g4 + d4 g4 d4 g4 + \bar "|." + + }% End of drums % + + \header { + title = "Molly Connell" + meter = "Strathspey" + composer = "B. de Boone/ M. Jansen/ N. Kuijkhoven/ E.T. de Boone, 2014" + instrument = "Tenor" + } +} \ No newline at end of file From 3b80ad94739f7c5a3227b46912ce69b53d3194c9 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 7 Aug 2015 10:23:05 +0200 Subject: [PATCH 15/33] Fixed the flam function, now useable for flams, drags, ruffs and swiss ruffs --- 2-4_marches/mackenzie_highlanders.side.ly | 14 +++--- lilydrum.ly | 57 ++++++++++++++++++++--- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly index f3775aa..001a352 100755 --- a/2-4_marches/mackenzie_highlanders.side.ly +++ b/2-4_marches/mackenzie_highlanders.side.ly @@ -15,17 +15,17 @@ \drummode { \repeat volta 2{ \partial 8 d8:32( | - g8) \tuplet 3/2 { d16 g d } \flamg g16. d32-> g16. g32 | - \flamd d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - \flamg g8[ \dragd d16. d32]-> g16.[ \dragd d32 d16. g32] | + \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d } \flamg g16. d32-> g16. g32 | - \flamd d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - \flamg g8-> \tuplet 3/2 { \flamd d16 g d-> } g16. g32 \flamd d8 | + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | d4:32( d8) } \break @@ -40,7 +40,7 @@ d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | - \flamg g8-> \tuplet 3/2 { \flamd d16 g d-> } g16. g32 \flamd d8 | + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | d4:32( d8) } } diff --git a/lilydrum.ly b/lilydrum.ly index 999d1c3..20a0acf 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -18,6 +18,7 @@ } %} +#(ly:set-option 'point-and-click #f) % Note name defs : % "d" for the right hand ("droite") and @@ -128,7 +129,7 @@ eighthBeaming = { } sixteenthBeaming = { \set Score.baseMoment = #(ly:make-moment 1 16) - \set Score.beatStructure = #'( 2 2 ) + \set Score.beatStructure = #'( 4 4 4 4 ) } \layout{ @@ -144,6 +145,9 @@ sixteenthBeaming = { % I like being able to identify the 8th notes subdivideBeams = ##t + strictBeatBeaming = ##t + + \override TupletBracket.bracket-visibility = ##f } } @@ -183,13 +187,18 @@ dynLine = #(define-music-function % Flams, Drags & the sort % % ================================================= % drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ + % Set settings \stemUp + \once \override Beam.positions = #'(1.8 . 1.8) + \once \override DrumStaff.Stem.length = #5 \override Flag.stroke-style = #"grace" - \once \override Beam.positions = #'(2 . 2) - \once \override DrumStaff.Stem.length = #6 - \override Score.GraceSpacing #'spacing-increment = #0 + \override Score.GraceSpacing #'spacing-increment = #1 \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) - \tiny \grace $notes \normalsize + + % Print notes + \grace $notes + + % Revert back \revert Score.Stem #'beamlet-default-length \revert Flag.stroke-style \stemNeutral @@ -220,13 +229,47 @@ sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % with start repeat sruffd = \drummode { \drumgrace { d16[ g g] }} % right Swiss Ruff sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % with start repeat - +% Embellishment functions, automatic left or right +% Flam flam = #(define-music-function (parser location note) (ly:music?) #{ % is note right-handed? then \flamd % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \flamg #} + #{ \flamd #}) + % print the note, else it won't show up + $note +#}) - #(if #f \flamg ($\flamd)) % fix \flam{gd} return +% Drag +drag = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \dragg #} + #{ \dragd #}) + % print the note, else it won't show up + $note +#}) +% Ruff +ruff = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \ruffg #} + #{ \ruffd #}) + % print the note, else it won't show up + $note +#}) + +% Swiss Ruff +sruff = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \sruffg #} + #{ \sruffd #}) % print the note, else it won't show up $note #}) \ No newline at end of file From e90059648cde8a9ebc7082bff973bc5ca268d7b0 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 21 Aug 2015 01:05:14 +0200 Subject: [PATCH 16/33] Created script to easily compile a score. Should be further extended for compiling a full drumscore, however, this will lead to a change in file structure of the 'music' files modified: TODO modified: lilydrum.ly new file: makedrum --- .gitignore | 1 + 4-4_marches/the_old_rustic_bridge.tenor.ly | 30 ++++ 5-4_marches/cullen_bay.bass.ly | 18 +++ 5-4_marches/cullen_bay.tenor.ly | 28 ++++ README.md | 4 + TODO | 39 +++-- airs/farewell_to_camraw.tenor.ly | 27 ++++ airs/the_mist_covered_mountains.tenor.ly | 37 +++++ lilydrum.ly | 89 ++++++++--- makedrum | 174 +++++++++++++++++++++ 10 files changed, 411 insertions(+), 36 deletions(-) create mode 100755 4-4_marches/the_old_rustic_bridge.tenor.ly create mode 100755 5-4_marches/cullen_bay.bass.ly create mode 100755 5-4_marches/cullen_bay.tenor.ly create mode 100755 airs/farewell_to_camraw.tenor.ly create mode 100755 airs/the_mist_covered_mountains.tenor.ly create mode 100755 makedrum diff --git a/.gitignore b/.gitignore index b7f1aa7..0bc45fd 100755 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *tmp* bwwtolily.py _output/ +pdf/ diff --git a/4-4_marches/the_old_rustic_bridge.tenor.ly b/4-4_marches/the_old_rustic_bridge.tenor.ly new file mode 100755 index 0000000..d0b0e3c --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge.tenor.ly @@ -0,0 +1,30 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \drummode { + \time 4/4 + + \repeat volta 2 { + \partial 16 g16 | + d4 g8 d g4 d8. g16 | + d8 g d4 g r | + d4 g8 d g d g d | + g4 r4 d4 r4 | + + d4 g8 d g4 d8. g16 | + d8 g d4 g r | + d4 g8 d g d g d | + g4 r4 d4 r4 + } + } + } + + \header { + title = "The Old Rustic Bridge" + meter = "March" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay.bass.ly b/5-4_marches/cullen_bay.bass.ly new file mode 100755 index 0000000..76b6148 --- /dev/null +++ b/5-4_marches/cullen_bay.bass.ly @@ -0,0 +1,18 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \time 5/4 + \repeat volta 2 { + \repeat unfold 8 { d4-^ g d-> g d | } + } + } + + \header { + title = "Cullen Bay" + meter = "March" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay.tenor.ly b/5-4_marches/cullen_bay.tenor.ly new file mode 100755 index 0000000..e926c63 --- /dev/null +++ b/5-4_marches/cullen_bay.tenor.ly @@ -0,0 +1,28 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \drummode { + \time 5/4 + \repeat volta 4 { + d8-> g d g d-> g d4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d8-> g d g d-> g d8.-> g16-> r8 d8-> | + d4 d4 d8 g8 d4 d4 | + + d4 g4 d4 g4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d4 g4 d8-> g8 d8.-> g16-> r8 d8-> + d4 d4 d8 g8 d4 d4 | + } + } + } + + \header { + title = "Cullen Bay" + meter = "March" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/README.md b/README.md index 10d34a9..ac83937 100755 --- a/README.md +++ b/README.md @@ -7,3 +7,7 @@ There has been a lilypond include file earlier made by Simon Froger (which inclu This is meant to extend or translate some parts. The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970 + + +Currently, the most advanced score is MacKenzie Highlanders in 2-4_marches/mackenzie_highlanders.side.ly +This score is used for most of the layout. \ No newline at end of file diff --git a/TODO b/TODO index d7791cc..c577211 100755 --- a/TODO +++ b/TODO @@ -1,15 +1,30 @@ TODO - * flam function : detect whether left flam or right flam. This depends on the note, whether it is right or left respectively * show 8th and 16th beats in beaming, currently only 8ths - * include EUSPBA flourishing symbols, maybe a sprite file ?!? - * spanners (traditional and regimental spanners) - * symbols - * Very special beats (backsticking, crosssticking and the like..) - * Macros for tutti's (unisons), "Part 2 of $n", + * Macro for tutti's (unisons) + * Macro for "Part 2 of $n" + * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming) + * A tuplet beginning with a flam has a strange tuplet beam (slanted) + * It's custormary to have 4 bars per line for portrait and 8 for landscape... - * Find a nice filing system for easy saving, editing, generation of the scores - *** script to easily generate the scores - should be able to generate single instrument scores aswell as full drumscores, - and possibly fullscores (with the pipetune) - from referenced files - *** templates \ No newline at end of file + * TEMPLATING + Find a nice filing system for easy saving, editing, generation of the scores + *** script to easily generate the scores + should be able to generate single instrument scores aswell as full drumscores, + and possibly fullscores (with the pipetune) + from referenced files + *** templates + + * SIDE sticking (lookup swiss notation) + regular default + cross-stick cross + rimshot default + cross + backstick white triangle pointing down + + + * FLOURISHING short note above-note + regular flourish \fl cross + ups \up arrow-up + scoop \scoop arrow-right-(diag-up\diag-down) + split the feather \stf xcircle + cartwheel \cart + (EUSPBA symbols) \ No newline at end of file diff --git a/airs/farewell_to_camraw.tenor.ly b/airs/farewell_to_camraw.tenor.ly new file mode 100755 index 0000000..d9c5dca --- /dev/null +++ b/airs/farewell_to_camraw.tenor.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \drummode { + \time 4/4 + \repeat volta 2 { + R1 + r8 g d16 g d g d8 g d16 g d g | + d8 g d16 g d g d4 d16 g d g | + d4 g16 d g d d4 r4 | + d4 d8 g d4 r4 | + d4 d8 g d4 r4 | + d8 g d g d4 d8 g | + d8 g r4 r2 | + } + } + } + + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains.tenor.ly new file mode 100755 index 0000000..8b4cc50 --- /dev/null +++ b/airs/the_mist_covered_mountains.tenor.ly @@ -0,0 +1,37 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \drummode { + \time 6/8 + \repeat volta 2 { + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8. g16 d8 g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8 g8 d8 g8 r4 + } + \repeat volta 2 { + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + r8. g16 d8 r8. d16 g8 | + d8 g8 d8 g8 r4 + } + } + } + + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly index 20a0acf..6372fae 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -85,8 +85,6 @@ drumPitchNames = % dynamics up \dynamicUp - - % slurs below rolls number %\override TextScript.outside-staff-priority = ##f %\override TextScript.side-axis = #0 @@ -103,10 +101,10 @@ drumPitchNames = %\override StemTremolo.Y-offset = #-2.8 % repeat brackets - %\consists "Horizontal_bracket_engraver" - %\override HorizontalBracket.staff-padding = #6.5 % staff-padding - %\override HorizontalBracket.direction = #DOWN % brackets under thr staff - %\override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets + \consists "Horizontal_bracket_engraver" + \override HorizontalBracket.staff-padding = #3.5 % staff-padding + \override HorizontalBracket.direction = #UP % brackets under thr staff + \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets } \context { @@ -147,10 +145,43 @@ sixteenthBeaming = { subdivideBeams = ##t strictBeatBeaming = ##t - \override TupletBracket.bracket-visibility = ##f + \override TupletBracket.bracket-visibility = #'if-no-beams } } +% ================================================= % +% Side Sticking (modifies note, or adds mark) % +% ================================================= % +backstick = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'triangle + $notes + \revert Staff.NoteHead.style + #}) +crossstick = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'xcircle + $notes + \revert Staff.NoteHead.style + #}) +rimshot = #(define-music-function (parser location notes) (ly:music?) + #{ + $notes + \once \override Staff.NoteHead.style = #'cross + \once \hide Stem + d + #}) + +% ================================================= % +% Tenor Flourishing % +% ================================================= % +flourish = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'cross + $notes + \revert Staff.NoteHead.style + #}) + % ================================================= % % Functions % % ================================================= % @@ -183,6 +214,13 @@ dynLine = #(define-music-function \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } #}) +tutti = #(define-event-function (parser location notes) (ly:music?) #{ + \startGroup + % still to add: a little 'u' + $notes + \stopGroup + #}) + % ================================================= % % Flams, Drags & the sort % % ================================================= % @@ -206,30 +244,33 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ % Flams -flamd = \drummode { \drumgrace { g8 } } % right Flam, actually flam(left) note(right) -flamddr = \drummode { \drumgrace { g8\startGroup } } % with start repeat -flamg = \drummode { \drumgrace { d8 } } % left Flam -flamgdr = \drummode { \drumgrace { d8\startGroup } } % with start repeat +flamd = \drummode { \drumgrace { g8 } } % Flam right +flamg = \drummode { \drumgrace { d8 } } % Flam left +flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start repeat +flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat % Drags -dragd = \drummode { \drumgrace { g16[ g] }} % right Drag -dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % with start repeat -dragg = \drummode { \drumgrace { d16[ d] }} % left Drag -draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % with start repeat +dragd = \drummode { \drumgrace { g16[ g] }} % Drag right +dragg = \drummode { \drumgrace { d16[ d] }} % Drag left +dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % Drag right with start repeat +draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % Drag left with start repeat % Ruff -ruffg = \drummode { \drumgrace { g16[ d g] }} % left Ruff -ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % with start repeat -ruffd = \drummode { \drumgrace { d16[ g d] }} % right Ruff -ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % with start repeat +ruffg = \drummode { \drumgrace { g16[ d g] }} % Ruff right +ruffd = \drummode { \drumgrace { d16[ g d] }} % Ruff left +ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % Ruff right with start repeat +ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % Ruff left with start repeat % Swiss Ruff -sruffg = \drummode { \drumgrace { g16[ d d] }} % left Swiss Ruff -sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % with start repeat -sruffd = \drummode { \drumgrace { d16[ g g] }} % right Swiss Ruff -sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % with start repeat +sruffg = \drummode { \drumgrace { g16[ d d] }} % Swiss Ruff right +sruffd = \drummode { \drumgrace { d16[ g g] }} % Swiss Ruff left +sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % Swiss Ruff right with start repeat +sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % Swiss Ruff left with start repeat + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Embellishment functions, automatic left or right %% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Embellishment functions, automatic left or right % Flam flam = #(define-music-function (parser location note) (ly:music?) #{ % is note right-handed? then \flamd diff --git a/makedrum b/makedrum new file mode 100755 index 0000000..72a5d13 --- /dev/null +++ b/makedrum @@ -0,0 +1,174 @@ +#!/usr/bin/python3.4 + +## Generate pdf form lilypond file +## by using standard command +## +## Most of programming was done by Sven Axelsson, http://svenax.net/ + +import codecs, os +from argparse import ArgumentParser + +class MakeDrum: + LILYPOND = 'lilypond' + VERSION = '0.7' + TMP_DIR = './tmp' + TMP_PREFIX = 'tmp_' + + def __init__(self): + # Gather options and create the template file + + usage = __file__ + parser = ArgumentParser(usage) + + parser.add_argument('--version', + action='store_true', dest='show_version', default=False, + help='show makeDrum version and exit') + parser.add_argument('--lilyversion', + action='store_true', dest='show_lilyversion', default=False, + help='show Lilypond version and exit') + + parser.add_argument('-p', '--paper-size', + dest='papersize', default='a4', + help='Paper size. Default: A4') + parser.add_argument('-o', '--orientation', + dest='orientation', default='landscape', + help='Paper orientation. Default: landscape') + parser.add_argument('-s', '--staff-size', + dest='staffsize', default='16', + help='Staff size. Default: 16pt.') + parser.add_argument('-f', '--format', + dest='format', default=None, + help='Use header format file "header_{format}". Default: "header_default"') + parser.add_argument('-w', '--view-spacing', + action='store_true', dest='view_spacing', default=False, + help='Turn on "Paper.annotatespacing".') + + parser.add_argument('--no-log', + action='store_false', dest='log', default=True, + help='Do not generate log files.') + parser.add_argument('--no-cleanup', + action='store_false', dest='clean', default=True, + help='Leave all temporary files in place') + parser.add_argument('music_file', + default='', nargs='+', + help='file to process') + parser.add_argument('-@', '--list_file', + dest='list_file', default='', + help='list of files to process') + + self.args = parser.parse_args() + + if self.args.show_version: + print(__name__, ' ', self.VERSION) + return + + if self.args.show_lilyversion: + print(os.system(self.LILYPOND+' --version')) + return + + if self.args.view_spacing: + self.args.view_spacing = "##t" + else: + self.args.view_spacing = "##f" + + # Input files + if self.args.list_file != '': + self.args.music_file.append(open(self.args.list_file, 'r').readlines()) + close(self.args.list_file) + + # Clean up of files + self.remove_tmp_dir = self.args.clean + + if not os.path.exists(os.path.join(os.path.curdir, self.TMP_DIR)): + try: os.makedirs(os.path.join(os.path.curdir, self.TMP_DIR)) + except: + print('Seems like no temporary directory can be created') + return + + + for file_path in self.args.music_file: + self.processit(self.TMP_DIR, file_path) + + #if not + #os.rmdir(self.TMP_DIR) + + def processit(self, tmp_dir, file): + if self.args.log: + logfile = os.path.join(self.TMP_DIR, file.strip('.ly').replace('/', '-')+'.log') + log = ' > '+logfile+' 2>&1' + else: + log = '' + + if self.args.format is None: + if file.endswith(".book"): + header_format = "header_book" + else: + header_format = "header_default" + + tmp_file = self.maketemplate(tmp_dir, file, header_format) + + print ('Compiling ', file, end=' ', flush=True) + + lilycmd = self.LILYPOND+' --pdf --output=./pdf/'+os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('ly')+' '+tmp_file+log + + if os.system(lilycmd) != 0: + self.remove_tmp_dir = False + print ('[Error]') + print (' ! Did not compile, please see the log at ', logfile) + else : + print ('[OK]') + os.remove(logfile) + os.remove(tmp_file) + + + def maketemplate(self, tmp_dir, file, header_format): + # set up a tmp file with template and file combined + tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + file.replace('/', '-')) + + out_file = codecs.open(tmp_file, 'w+', 'utf8') + out_file.write(u'\ufeff') + + out_file.write(u""" +% Generated from """+file+""" by """+__file__+""" + +\\version "2.18.0" + +#(ly:set-option 'point-and-click #f) + +#(set-global-staff-size """+self.args.staffsize+""") +#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") + +\\include "../"""+header_format+""".ily" +\\include "lilydrum.ly" + +% Local tweaks +\\paper { + ragged-bottom = ##t +} +\layout { + \context { + \Score + % We only permit explicit line breaks + \override NonMusicalPaperColumn #'line-break-permission = ##f + } +} + +% The tune to generate. + """) + + # Read lily file into tmp file + music = codecs.open(file, 'r', 'utf8').read() + if music.startswith(u'\ufeff'): music = music[1:] + music = music.split(u'\n') + printit = 1 + for line in music: + if line.strip().startswith(u'\\include "lilydrum.ly"'): continue + if printit: + out_file.write(line.replace('\r', '')+'\n') + out_file.close() + + # Return tmp_file_path + return tmp_file + + +MakeDrum(); \ No newline at end of file From 460aceb88507d5c1fd5b205498aa6bd055e34871 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 21 Aug 2015 03:24:32 +0200 Subject: [PATCH 17/33] Moved scores for better naming Slight update of the TODO Added a symbol for the split the feather, however this is not the correct one yet --- .gitignore | 3 +- 2-4_marches/black_bear.ly | 50 -------------- 2-4_marches/mackenzie_highlanders.side.ly | 15 ++-- 4-4_marches/rowan_tree.ly | 33 --------- 4-4_marches/scotland_the_brave.ly | 36 ---------- TODO | 18 ++--- airs/alexander_mackenzie.ly | 50 -------------- airs/flower_of_scotland.ly | 39 +++++++++++ lilydrum.ly | 8 ++- standards/standards.bass.ly | 68 ++---------------- standards/standards.tenor.ly | 84 +++++++++++++++++------ 11 files changed, 129 insertions(+), 275 deletions(-) delete mode 100644 2-4_marches/black_bear.ly delete mode 100644 4-4_marches/rowan_tree.ly delete mode 100644 4-4_marches/scotland_the_brave.ly delete mode 100644 airs/alexander_mackenzie.ly create mode 100755 airs/flower_of_scotland.ly diff --git a/.gitignore b/.gitignore index 0bc45fd..eb0973e 100755 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.png *.log *tmp* -bwwtolily.py +*.py _output/ pdf/ +fullscores/* diff --git a/2-4_marches/black_bear.ly b/2-4_marches/black_bear.ly deleted file mode 100644 index a034c77..0000000 --- a/2-4_marches/black_bear.ly +++ /dev/null @@ -1,50 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \drums { - \time 2/4 - - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d32 g32 d32 g32 d4 | - r4^\markup {\bold HOI} d8:32( g8:32)(-> | - - \break - - d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d4 d4:32( | - d8) \flamg g8 \flamd d8 - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - d8 - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - - \break - - d4:32( d8.:32)( g16:32)( | - d8:32)( g8:32)( d4)( | - g8:32)( d8:32)( g16.) d32-> g16. g32 | - \flamd d8 d8:32( g8) \bar "|." - - }% End of drums % -} - -\header { - title = "Black Bear" - meter = "March" - composer = "E.T. de Boone, 2015" - instrument = "Side" -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly index 001a352..fc71f5e 100755 --- a/2-4_marches/mackenzie_highlanders.side.ly +++ b/2-4_marches/mackenzie_highlanders.side.ly @@ -1,8 +1,3 @@ -\version "2.18.2" - - -\include "lilydrum.ly" - \score { \new DrumStaff = "staff_side" { \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) @@ -15,10 +10,10 @@ \drummode { \repeat volta 2{ \partial 8 d8:32( | - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + g8) \tuplet 3/2 { \backstick d16 g d } \flam g16. d32-> g16. g32 | \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | + \flam g8 \drag d16. d32-> g16. \drag d32 d16. g32 | d4:32( d8) d8:32( | g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | @@ -45,10 +40,8 @@ } } } - -} - \header { title = "MacKenzie Highlanders" meter = "March" - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree.ly b/4-4_marches/rowan_tree.ly deleted file mode 100644 index ecce472..0000000 --- a/4-4_marches/rowan_tree.ly +++ /dev/null @@ -1,33 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \drums { - \time 4/4 - - % Part 1 - \repeat volta 2 { - \partial 4 - r8 d8^"Part 2 of 2" | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - } - \break - % Part 2 ( Part 2.2 = Part 1) - d8. g16 | - d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - }% End of drums % -} - -\header { - title = "Rowan Tree" - meter = "Quick March" - composer = "" - instrument = "Side" -} diff --git a/4-4_marches/scotland_the_brave.ly b/4-4_marches/scotland_the_brave.ly deleted file mode 100644 index a5eded7..0000000 --- a/4-4_marches/scotland_the_brave.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -#(set-default-paper-size "a4landscape") -\score { - \drums { - \time 4/4 - - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | - \flamd d4 d4:32( d4) r8 - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - g8 | - d4:32( d8) g8 d4:32( d8) g8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d4 d4:32( d4) r8 - - }% End of drums % -} - -\header { - title = "Scotland the Brave" - meter = "Quick March" - composer = "" - instrument = "Side" -} diff --git a/TODO b/TODO index c577211..41f2f2e 100755 --- a/TODO +++ b/TODO @@ -4,12 +4,12 @@ TODO * Macro for "Part 2 of $n" * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming) * A tuplet beginning with a flam has a strange tuplet beam (slanted) - * It's custormary to have 4 bars per line for portrait and 8 for landscape... + * It's customary to have 4 bars per line for portrait and 8 for landscape... * TEMPLATING Find a nice filing system for easy saving, editing, generation of the scores *** script to easily generate the scores - should be able to generate single instrument scores aswell as full drumscores, + should be able to generate single instrument scores aswell as full drumscores (side, tenor, bass), and possibly fullscores (with the pipetune) from referenced files *** templates @@ -21,10 +21,10 @@ TODO backstick white triangle pointing down - * FLOURISHING short note above-note - regular flourish \fl cross - ups \up arrow-up - scoop \scoop arrow-right-(diag-up\diag-down) - split the feather \stf xcircle - cartwheel \cart - (EUSPBA symbols) \ No newline at end of file + * FLOURISHING short long note above-note + regular flourish \fl \flourish cross + ups \up arrow-up + scoop \scoop arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one] + split the feather \stf \splitTheFeather xcircle + cartwheel \cart \cartwheel + (further EUSPBA symbols) \ No newline at end of file diff --git a/airs/alexander_mackenzie.ly b/airs/alexander_mackenzie.ly deleted file mode 100644 index 5a54e84..0000000 --- a/airs/alexander_mackenzie.ly +++ /dev/null @@ -1,50 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \drums { - \time 6/8 - - % Part 1 - \repeat volta 2 { - \partial 8 d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | - - \break - - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - d8:32( - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | - g4) \flamd d16. g32 d8:32( g8.) g16 | - d4.:32( d4) d8:32( | - - \break - - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - - }% End of drums % -} - -\header { - title = "Alexander MacKenzie" - meter = "Slow March" - composer = "E.T. de Boone, 2015" - instrument = "Side" -} \ No newline at end of file diff --git a/airs/flower_of_scotland.ly b/airs/flower_of_scotland.ly new file mode 100755 index 0000000..1876c05 --- /dev/null +++ b/airs/flower_of_scotland.ly @@ -0,0 +1,39 @@ +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 6/8 + + \drummode { + \repeat volta 2 { + \partial 8 g8 | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + \break + d4.:32( d4.) | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + \break + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \break + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d4 | + + } + } + } + \header { + title = "Flower of Scotland" + meter = "Air" + } +} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly index 6372fae..9dfb364 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -127,7 +127,7 @@ eighthBeaming = { } sixteenthBeaming = { \set Score.baseMoment = #(ly:make-moment 1 16) - \set Score.beatStructure = #'( 4 4 4 4 ) + \set Score.beatStructure = #'( 4) } \layout{ @@ -181,6 +181,12 @@ flourish = #(define-music-function (parser location notes) (ly:music?) $notes \revert Staff.NoteHead.style #}) +splitTheFeather = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'xcircle + $notes + \revert Staff.NoteHead.style + #}) % ================================================= % % Functions % diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly index c5202ea..e9384ad 100755 --- a/standards/standards.bass.ly +++ b/standards/standards.bass.ly @@ -1,13 +1,7 @@ \version "2.18.2" -\include "lilydrum2.ly" +\include "lilydrum.ly" -\header { - meter = "March" - instrument = "Bass" -} - -\markup "2/4 Standards" \score { \new DrumStaff { \time 2/4 @@ -17,62 +11,8 @@ } \header { - title = "2/4 Standards" - } -} - -\markup "3/4 Standards" -\score { - \new DrumStaff { - \time 3/4 - - \repeat volta 2 { - \repeat unfold 4 { d4-> g4 d4 } - } - } - - \header { - title = "3/4 Standards" - } -} - -\markup "4/4 Standards" -\score { - \new DrumStaff { - \time 4/4 - \numericTimeSignature - - \repeat volta 2 { - \repeat unfold 3 { d4-^ g4 d4-> g4 } - d4-^ g4 d4 r4 | - } - } - - \header { - title = "4/4 Standards" - } -} - -\markup "6/8 Standards" -\score { - \new DrumStaff { - \time 6/8 - - % Part 1 - \repeat volta 2 { - d4. g4. | - d4. r4. | - d4. g4. | - d4. r4 g8 | - d4. g4. | - d4. r4. | - d4. g4. | - d4. r4. | - - } - } - - \header { - title = "6/8 Standards" + title = "Cullen Bay" + meter = "March" + instrument = "Bass" } } \ No newline at end of file diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly index 8b8ed58..ecc58fb 100755 --- a/standards/standards.tenor.ly +++ b/standards/standards.tenor.ly @@ -3,17 +3,35 @@ \include "lilydrum.ly" \header { - meter = "March" instrument = "Tenor" + title = "Standards" } -\markup "2/4 Standards" \score { \drums { \time 2/4 - \repeat unfold 8 { d8-> g8 d8 g8 } - \break - \repeat unfold 8 { d4 g4} + + \repeat volta 2 { + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d4-> r | + \bar "||" + \flourish { + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 d | + } + } } \header { @@ -21,13 +39,22 @@ } } -\markup "3/4 Standards" \score { \drums { \time 3/4 \repeat volta 2 { - \repeat unfold 4 { d4-> g4 d4 } + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + \bar "||" + \flourish{ + d4-> d d | + g4-> g g | + d4-> d g | + g4-> d g | + } } } @@ -36,14 +63,22 @@ } } -\markup "4/4 Standards" \score { \drums { \time 4/4 \repeat volta 2 { - \repeat unfold 3 { d8[-^ g8] d8[ g8] d8[-> g8] d8[ g8] } - d4-^ g4 d4 r4 | + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d4-^ g d r | + \bar "||" + \flourish { + d4 d g g | + d4 d g g | + d4 d g g | + } + \flourish d4 \flourish g \splitTheFeather d r | } } @@ -52,21 +87,30 @@ } } -\markup "6/8 Standards" \score { \drums { \time 6/8 - % Part 1 \repeat volta 2 { - d4. g4. | - d4. r4. | - d4. g4. | - d4. r4 g8 | - d4. g4. | - d4. r4. | - d4. g4. | - d4. r4. | + \flourish d4. \flourish g | + \splitTheFeather d r | + d g | + d8 r8 g8 d4. | + \flourish d4. \flourish g | + \splitTheFeather d r | + d g | + d8 r8 g8 d4. | + \bar "||" + \flourish { + d4. d | + g g | + d d | + g g | + d d | + g g | + d g | + } + \splitTheFeather d r | } } From 6d9bb716d99f629818a086af1e14d86388104b84 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 16 Oct 2015 23:25:22 +0200 Subject: [PATCH 18/33] New scores and versions Added flourishing symbols, however not yet complete: want a function not markup Further update of lilydrum Started a cheatsheet Removed fullscore attempts, will be retried later --- .gitignore | 2 + 2-4_marches/black_bear.v1.2.side.ly | 57 +++++++++++ 2-4_marches/black_bear.v1.3.side.ly | 73 ++++++++++++++ .../mackenzie_highlanders.alternate.side.ly | 63 ++++++++++++ 2-4_marches/mackenzie_highlanders.side.ly | 5 +- 4-4_marches/the_pikemans_march.v1.5.side.ly | 53 +++++++++++ 4-4_marches/were_no_awa_tae_bide_awa.side.ly | 29 ++++++ airs/abide_with_me.side.ly | 32 +++++++ ...scotland.ly => flower_of_scotland.side.ly} | 0 build_all | 8 ++ cheatsheet.ly | 74 +++++++++++++++ .../black_bear/Black_Bear_Hornpipe_The.bww | 71 -------------- .../2-4_marches/black_bear/black_bear.full.ly | 26 ----- .../2-4_marches/black_bear/black_bear.head.ly | 6 -- .../black_bear/black_bear.pipes.ly | 46 --------- .../black_bear/black_bear.snare.ly | 48 ---------- fullscores/template.ly | 95 ------------------- header_book.ily | 42 ++++++++ header_default.ily | 33 +++++++ lilydrum.ly | 39 +++++--- makedrum | 73 +++++++++++--- other/band_of_brothers.snare.ly | 50 ++++++++++ standards/standards.tenor.ly | 14 ++- strathspeys/molly_connell.bass.ly | 2 +- TODO => todo (hoofdletterconflict) | 2 +- 25 files changed, 616 insertions(+), 327 deletions(-) create mode 100755 2-4_marches/black_bear.v1.2.side.ly create mode 100755 2-4_marches/black_bear.v1.3.side.ly create mode 100755 2-4_marches/mackenzie_highlanders.alternate.side.ly create mode 100755 4-4_marches/the_pikemans_march.v1.5.side.ly create mode 100755 4-4_marches/were_no_awa_tae_bide_awa.side.ly create mode 100755 airs/abide_with_me.side.ly rename airs/{flower_of_scotland.ly => flower_of_scotland.side.ly} (100%) create mode 100755 build_all create mode 100755 cheatsheet.ly delete mode 100755 fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww delete mode 100644 fullscores/2-4_marches/black_bear/black_bear.full.ly delete mode 100644 fullscores/2-4_marches/black_bear/black_bear.head.ly delete mode 100644 fullscores/2-4_marches/black_bear/black_bear.pipes.ly delete mode 100644 fullscores/2-4_marches/black_bear/black_bear.snare.ly delete mode 100755 fullscores/template.ly create mode 100755 header_book.ily create mode 100755 header_default.ily create mode 100755 other/band_of_brothers.snare.ly rename TODO => todo (hoofdletterconflict) (96%) diff --git a/.gitignore b/.gitignore index eb0973e..bd55f6c 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.gitignore *.ps *.pdf *.png @@ -6,4 +7,5 @@ *.py _output/ pdf/ +fullscores/ fullscores/* diff --git a/2-4_marches/black_bear.v1.2.side.ly b/2-4_marches/black_bear.v1.2.side.ly new file mode 100755 index 0000000..710c759 --- /dev/null +++ b/2-4_marches/black_bear.v1.2.side.ly @@ -0,0 +1,57 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 2/4 + \eighthBeaming + + \drummode { + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\markup {\bold YELL} d8:32( g8:32)(-> | + + \break + + d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 + + } + + \break + + g8 + % Part 2 ( Part 2.2 = Part 1) + \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \break + + \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | + \bar "|." + + }% End of drums % + } + \header { + title = "Black Bear" + meter = "March" + composer = "version 1.2, 2015" + instrument = "Side" + } +} \ No newline at end of file diff --git a/2-4_marches/black_bear.v1.3.side.ly b/2-4_marches/black_bear.v1.3.side.ly new file mode 100755 index 0000000..164a84a --- /dev/null +++ b/2-4_marches/black_bear.v1.3.side.ly @@ -0,0 +1,73 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +yell = \markup { \bold \small HOY } + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + + \time 2/4 + \eighthBeaming + + \drummode { + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16.-> \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( \< g8:32)(-> | + + \break + + d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 + + } + + \break + + g8 + % Part 2 ( Part 2.2 = Part 1) + \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \break + + \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | + \bar "||" + \break + + d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( \< g8:32)(-> | + + \break + + d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 r8 + + }% End of drums % + } + \header { + title = "Black Bear" + meter = "March" + composer = "version 1.3, 2015" + instrument = "Side" + } +} diff --git a/2-4_marches/mackenzie_highlanders.alternate.side.ly b/2-4_marches/mackenzie_highlanders.alternate.side.ly new file mode 100755 index 0000000..829a22b --- /dev/null +++ b/2-4_marches/mackenzie_highlanders.alternate.side.ly @@ -0,0 +1,63 @@ +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 2/4 + \eighthBeaming + + \drummode { + \repeat volta 2{ + \partial 8 d8:32( | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | + + d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d4:32( d8) + } + \break + + \partial 8 g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 g8-> | + + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | + + d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d4:32( d8) g8 + + \bar "||" + \break + + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + \flam d4 d8:32(-> \< g8:32)(-> | + + d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } + d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d4:32( d4) + \bar ":|" + } + + } + \header { + title = "MacKenzie Highlanders" + composer = "alternate version, 2015" + meter = "March" + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly index fc71f5e..2a1132b 100755 --- a/2-4_marches/mackenzie_highlanders.side.ly +++ b/2-4_marches/mackenzie_highlanders.side.ly @@ -10,7 +10,7 @@ \drummode { \repeat volta 2{ \partial 8 d8:32( | - g8) \tuplet 3/2 { \backstick d16 g d } \flam g16. d32-> g16. g32 | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | \flam g8 \drag d16. d32-> g16. \drag d32 d16. g32 | @@ -39,9 +39,10 @@ d4:32( d8) } } + } \header { title = "MacKenzie Highlanders" meter = "March" } -} \ No newline at end of file +} diff --git a/4-4_marches/the_pikemans_march.v1.5.side.ly b/4-4_marches/the_pikemans_march.v1.5.side.ly new file mode 100755 index 0000000..b4535b9 --- /dev/null +++ b/4-4_marches/the_pikemans_march.v1.5.side.ly @@ -0,0 +1,53 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 4/4 + \eighthBeaming + + \drummode { + \repeat volta 2 { + \partial 8 g16. g32 | + \flamd d4-^ d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | + \flamd d8.. g32 \tuplet 3/2 { d16 d g} \flam d16. g32 \tuplet 3/2 { d16 d g } \flam d16. g32 \flam d16. d32 \tuplet 3/2 { g16 g d } + \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | + \break + \flamd d4-^ d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | + \flam d8. g16 d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> d8.)-> \parenthesize d16:64( \parenthesize d8:64) + } + \break + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | + + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | + + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 + }% End of drummode % + } + \header { + title = "The Pikeman's March" + meter = "March" + composer = "version 1.5, 2015" + instrument = "Side" + } +} \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa.side.ly b/4-4_marches/were_no_awa_tae_bide_awa.side.ly new file mode 100755 index 0000000..38a741a --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa.side.ly @@ -0,0 +1,29 @@ +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 4/4 + \eighthBeaming + + \drummode { + \repeat volta 2 { + \partial 8 d16. g32 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + \tuplet 3/2 { g16) d g } \flam d16. g32 \tuplet 3/2 { d16 g d } \flam g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flam d8 r8 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + g4) d4:32( d4) r8 g8 | + \break + d2:32(\< d4)\! r8 g8 | + d8:32( g8) g8 d8:32( d8) r8 r8 g8 | + \flam d8 g16. d32-> g16. g32 \flam d16. g32 \flam d16. d32:128( d16) g16-> d16 g d \flam d | + d4 d4:32( d4) r8 + } + } + } + \header { + title = "We're No' Awa Tae Bide Awa" + meter = "March" + } +} \ No newline at end of file diff --git a/airs/abide_with_me.side.ly b/airs/abide_with_me.side.ly new file mode 100755 index 0000000..0089db9 --- /dev/null +++ b/airs/abide_with_me.side.ly @@ -0,0 +1,32 @@ +\score { + \new DrumStaff = "staff_side" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Side" + \set Staff.shortInstrumentName = #"S.D." + + \time 4/4 + \eighthBeaming + %\markup{ 1st time through rolls, n+1th time: n drums play score} + \drummode { + \repeat unfold 3{ + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8 \flam g-> | + d4:32( \< d4:32)( d4:32)( d4:32)( \! \> | + + \break + } + \break + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 \flam g | + \flam d8->\< \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8[ \drag g]->\! | + d4:32( \> d4:32)( d4:32)( d4:32)( | + d4:32)( \< d4:32)( d4:32)( d4:32) \! + + } + + } + \header { + title = "Abide with Me" + meter = "Hymn" + } +} diff --git a/airs/flower_of_scotland.ly b/airs/flower_of_scotland.side.ly similarity index 100% rename from airs/flower_of_scotland.ly rename to airs/flower_of_scotland.side.ly diff --git a/build_all b/build_all new file mode 100755 index 0000000..9370e5e --- /dev/null +++ b/build_all @@ -0,0 +1,8 @@ +#!/bin/bash + +MKDRUMCOMMAND="./makedrum" + +for d in *_marches strathspeys standards jigs airs hornpipes other +do + $MKDRUMCOMMAND $d/*.ly +done; diff --git a/cheatsheet.ly b/cheatsheet.ly new file mode 100755 index 0000000..f16c5b4 --- /dev/null +++ b/cheatsheet.ly @@ -0,0 +1,74 @@ + +#(ly:set-option 'point-and-click #f) + +% Choose a size +#(set-global-staff-size 18) +#(set-default-paper-size "a4" 'landscape) + +\paper { + indent = 0\mm + ragged-right = ##t + ragged-bottom = ##t +} +\layout { + indent = 30\mm + \context { + \Score + \override NonMusicalPaperColumn #'line-break-permission = ##f + } +} + +\include "lilydrum.ly" + +\score { + \new DrumStaff { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = "Plain notes" + \drummode { + d4 g dcross gcross \rimshot d \rimshot g dback gback + } + } + \addlyrics { + d g dcross gcross "\rimshot d" "\rimshot g" dback gback + } +} + +\score { + \new DrumStaff { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = "Tenor Flourishing" + \drummode { + d^\splitTheFeather g^\cartWheel d^\up {\scoop d8 g8 d4} g d \flourish { d4 g d g } + } + } + \addlyrics { + "\splitTheFeather" "cartWheel" "up" "scoop d g d" "\flourish { }" + } +} + + +\score { + \new DrumStaff { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = "Tenor Flourishing" + \drummode { + \partial 8 d8:32( | + \triplet { g16) d g} \flam d16. g32 \drag g16 g16 \triplet { d16 g:64 d->} + } + } + \addlyrics { + } +} + +% # Writing parts +% rolls +% tuplets +% tutti +% accents ( > v ^) +% + +\header { + title = "Cheat sheet for entering pipeband drumming music" + subtitle = "Intended for Lilypond 2.18 or better" + tagline = \markup { "Cpl ET de Boone, Seaforths of Holland" } +} diff --git a/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww b/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww deleted file mode 100755 index b34acba..0000000 --- a/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww +++ /dev/null @@ -1,71 +0,0 @@ -Bagpipe Reader:1.0 - -MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69) - -FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880) - -InstrumentMappings,(71,71,45,33,1000,60,70) - -GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200) - -FontSizes,(90,100,75,80,250) - -TuneFormat,(1,0,M,L,500,500,500,500,L,1,0) - - - -"The Black Bear Hornpipe",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0) - -"March",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0) - -"Trad.",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) - -"P.M. FrankJan de Boone-The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) -"B 3",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0) -"2001",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0) -TuneTempo,84 - - -& sharpf sharpc 2_4 I!'' gg LAr_8 'la Bl_16 -! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! dbe Er_8 gg Bl_8 grp Br_8 gg Er_16 Dl_16 -! gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c gg LAr_16 'la Bl_32 gg Cr_32 dg LAl_16 'la - -!t - -& sharpf sharpc thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! dbe Er_8 grp El_8 gg Er_16 'e HGl_32 tg Fr_32 El_16 'e -! thrd Dr_8 gg Fl_8 thrd D_8 ''!I - - -"part 2" - -& sharpf sharpc space E_8 -! gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16 thrd Dr_8 gg Dr_16 El_16 -! dbhg HGr_8 tg Fr_16 El_16 gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32 -! gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16 thrd Dr_8 gg Dr_16 El_16 -! dbhg HGr_8 tg Fr_16 El_16 gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32 -!t - -& sharpf sharpc - HAr_8 LAr_16 dbla LAl_16 gg Cr_8 dg LAr_16 dbla LAl_16 -! gg Dr_8 Br_16 dbb Bl_16 gg Er_8 Cr_16 dbc Cl_16 -! gg Dr_32 Fl_16 'f gg Dr_32 Fl_16 'f Er_16 'e HGl_32 tg Fr_32 HGl_16 'hg -! HAr_8 grp HAl_8 strhg HAr_16 'ha HGl_32 tg Fl_16 'f El_16 - -!I - -& sharpf sharpc - thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! dbe Er_8 gg Bl_8 grp Br_8 gg Er_16 Dl_16 -! gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c gg LAr_16 'la Bl_32 gg Cr_32 dg LAl_16 'la - -!t - -& sharpf sharpc thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! thrd Dr_8 lgstd Dl_8 gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32 -! dbe Er_8 grp El_8 gg Er_16 'e HGl_32 tg Fr_32 El_16 'e -! thrd Dr_8 gg Fl_8 thrd D_8 !I \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.full.ly b/fullscores/2-4_marches/black_bear/black_bear.full.ly deleted file mode 100644 index 6a236c7..0000000 --- a/fullscores/2-4_marches/black_bear/black_bear.full.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "black_bear.pipes.ly" -\include "black_bear.snare.ly" - -#(set-default-paper-size "a4landscape") - -\score { - { - \new StaffGroup << - \new Staff \with { - instrumentName = #"Pipes" - shortInstrumentName = #"P" - } \pipes - \new DrumStaff \with { - instrumentName = #"Snare" - shortInstrumentName = #"S.D." - } \snare - >> - } -} -\header { - title = "Black Bear" - meter = "March" - instrument = "" -} \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.head.ly b/fullscores/2-4_marches/black_bear/black_bear.head.ly deleted file mode 100644 index 5fdcae4..0000000 --- a/fullscores/2-4_marches/black_bear/black_bear.head.ly +++ /dev/null @@ -1,6 +0,0 @@ -\version "2.18.2" - -\header { - title = "Black Bear" - meter = "March" -} diff --git a/fullscores/2-4_marches/black_bear/black_bear.pipes.ly b/fullscores/2-4_marches/black_bear/black_bear.pipes.ly deleted file mode 100644 index 2f3f5d7..0000000 --- a/fullscores/2-4_marches/black_bear/black_bear.pipes.ly +++ /dev/null @@ -1,46 +0,0 @@ -\include "bagpipe_new.ly" -pipes = { - - - \time 2/4 - \bagpipeKey - \quarterBeaming - - % Part 1 - \repeat volta 2 { - \partial 8 \grg a16. [ b32 ] | - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | - \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] | - \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 ] \grg c32 [ \grd a16. ] | - - \break - - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | - \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] | - \dble e8 [ \grip e8 ] \grg e16. [ g32 ] \grA f32 [ e16. ] | - \thrwd d8 [ \grg f8 ] \thrwd d8 - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - e8 | - \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | - \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | - \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] | - \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | - - \break - - A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] | - \grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] | - \grg d32 [ f16. ] \grg d32 [ f16. ] e16. [ g32 ] \grA f32 [ g16. ] | - A8 [ \grip A8 ] \grg A16. [ g32 f16. ] e32 ] \bar ".|" - } -\header { - title = "The Black Bear Hornpipe" - meter = "March" - arranger = "Trad." - instrument = "Bagpipes" -} \ No newline at end of file diff --git a/fullscores/2-4_marches/black_bear/black_bear.snare.ly b/fullscores/2-4_marches/black_bear/black_bear.snare.ly deleted file mode 100644 index 4fa2752..0000000 --- a/fullscores/2-4_marches/black_bear/black_bear.snare.ly +++ /dev/null @@ -1,48 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -snare = { - - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d32 g32 d32 g32 d4 | - r4^\markup {\bold HOI} d8:32( g8:32)(-> | - - \break - - d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d4 d4:32( | - d8) \flamg g8 \flamd d8 - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - d8 - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - - \break - - d4:32( d8.:32)( g16:32)( | - d8:32)( g8:32)( d4)( | - g8:32)( d8:32)( g16.) d32-> g16. g32 | - \flamd d8 d8:32( g8) \bar "|." - - }% End of drums % - - -\header { - title = "Black Bear" - meter = "March" - composer = "E.T. de Boone, 2015" - instrument = "Snare" -} \ No newline at end of file diff --git a/fullscores/template.ly b/fullscores/template.ly deleted file mode 100755 index 704b22d..0000000 --- a/fullscores/template.ly +++ /dev/null @@ -1,95 +0,0 @@ -\version "2.19.22" - -print_pipes = #f -print_snare = #f -print_tenor = #f -print_bass = #f - -file_pipes = "Pipes" -file_snare = "Snare" -file_tenor = "Tenor" -file_bass = "Bass" - -composer_pipes = "Trad." -composer_snare = "Dean Hall, 1999" -composer_tenor = "Dean Hall, 1999" -composer_bass = "Dean Hall, 1999" - - -%=======================================% -% You should not have to touch below % -%=======================================% - -\include "bagpipe.ly" -\include "lilydrum.ly" - -#(if (\print_pipes) (music_pipes = \include \file_pipes)) -#(if (\print_snare) (music_snare = \include \file_snare)) -#(if (\print_tenor) (music_tenor = \include \file_tenor)) -#(if (\print_bass) (music_bass = \include \file_bass )) - -#(ly:set-option 'point-and-click #f) -\paper{ - ragged-bottom = ##t -} - -\score { - { - << - #(if (\print_pipes) ( - \new Staff = "staff_pipes" { - \set Staff.instrumentName = #"Pipes" - \set Staff.shortInstrumentName = #"P." - - \music_pipes - } - )) - #(if (\print_snare) ( - \new DrumStaff = "staff_snare" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = #"Snare" - \set Staff.shortInstrumentName = #"S.D." - - \music_snare - } - )) - #(if (\print_tenor) ( - \new DrumStaff = "staff_tenor" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = #"Tenor" - \set Staff.shortInstrumentName = #"T.D." - - \music_tenor - } - )) - #(if (\print_bass) ( - \new DrumStaff = "staff_bass" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = #"Bass" - \set Staff.shortInstrumentName = #"B.D." - - \music_bass - } - )) - >> - } -} -\header { - title = "Title" - meter = "Meter" - subtitle = "Subtitle" - subsubtitle = "Subsubtitle" - - composer = \markup { - \column { - #(if (\print_pipes) (\line{Pipes: \composer_pipes})) - #(if (\print_snare) (\line{Snare: \composer_snare})) - #(if (\print_tenor) (\line{Tenor: \composer_tenor})) - #(if (\print_bass ) (\line{Bass: \composer_bass} )) - } - } - arranger = "Arranger" - % The following fields are centered at the bottom - tagline = "tagline goes at the bottom of the last page" - copyright = "copyright goes at the bottom of the first page" -} \ No newline at end of file diff --git a/header_book.ily b/header_book.ily new file mode 100755 index 0000000..b4e9177 --- /dev/null +++ b/header_book.ily @@ -0,0 +1,42 @@ +%{ + Header formatting for tunes. Customize to get your name in the tag line. +%} + +\version "2.16.0" + +today = #(strftime "%B %e, %Y" (localtime (current-time))) + +\paper { + raggedbottom = ##t + tagline = \markup { + \line { + "Cpl Eric Teunis de Boone, Seaforths of Holland," + \concat { "(rev. " \today ")" } + } + } + bookTitleMarkup = \markup { + \override #'(baseline-skip . 3.5) + \column { + \fill-line { \fromproperty #'header:dedication } + \override #'(baseline-skip . 3.5) + \column { + \huge \larger \bold + \fill-line { + \larger \fromproperty #'header:title + } + \fill-line { + \large \smaller \bold + \larger \fromproperty #'header:subtitle + } + \fill-line { + \smaller \bold + \fromproperty #'header:source + } + \fill-line { + \line { \fromproperty #'header:meter } + \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + } + } + } + } +} diff --git a/header_default.ily b/header_default.ily new file mode 100755 index 0000000..2be6319 --- /dev/null +++ b/header_default.ily @@ -0,0 +1,33 @@ +%{ + Header formatting for tunes. Customize to get your name in the tag line. +%} + +\version "2.16.0" + +today = #(strftime "%B %e, %Y" (localtime (current-time))) + +\paper { + raggedbottom = ##t + tagline = \markup { + \line { + "Cpl ET de Boone, Seaforths of Holland," + \concat { "(rev. " \today ")" } + } + } + scoreTitleMarkup = \markup { + \override #'(baseline-skip . 3) + \column { + \fill-line { + \column { + \large \bold \fromproperty #'header:title + \bold \fromproperty #'header:subtitle + } + \fromproperty #'header:meter + \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + } + $(if (not (ly:get-option 'without-comment)) + (markup #:justify-field 'header:comment) + (markup)) + } + } +} diff --git a/lilydrum.ly b/lilydrum.ly index 9dfb364..81a77e6 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -48,8 +48,8 @@ drumPitchNames = #(define pipeband-style '( (right-hand () #f 1) (left-hand () #f -1) - (right-backstick cross #f 1) - (left-backstick cross #f -1) + (right-crossstick cross #f 1) + (left-crossstick cross #f -1) (right-backstick xcircle #f 1) (left-backstick xcircle #f -1) ) @@ -120,14 +120,13 @@ drumPitchNames = % Define some tweaks for printing nicely % % =================================================== %\ - eighthBeaming = { \set Score.baseMoment = #(ly:make-moment 1 8) \set Score.beatStructure = #'( 2 ) } sixteenthBeaming = { \set Score.baseMoment = #(ly:make-moment 1 16) - \set Score.beatStructure = #'( 4) + \set Score.beatStructure = #'( 4 ) } \layout{ @@ -154,7 +153,7 @@ sixteenthBeaming = { % ================================================= % backstick = #(define-music-function (parser location notes) (ly:music?) #{ - \temporary \override Staff.NoteHead.style = #'triangle + \temporary \override Staff.NoteHead.style = \ $notes \revert Staff.NoteHead.style #}) @@ -167,31 +166,45 @@ crossstick = #(define-music-function (parser location notes) (ly:music?) rimshot = #(define-music-function (parser location notes) (ly:music?) #{ $notes - \once \override Staff.NoteHead.style = #'cross - \once \hide Stem - d + #}) % ================================================= % % Tenor Flourishing % % ================================================= % +splitTheFeather = \markup{ \musicglyph #"noteheads.s2xcircle"} +cartWheel = \markup { \musicglyph #"timesig.neomensural94" } +up = \markup { + % \combine + %\tiny \triangle ##t + \center-align \draw-line #'(0 . 2) + } + flourish = #(define-music-function (parser location notes) (ly:music?) #{ \temporary \override Staff.NoteHead.style = #'cross $notes \revert Staff.NoteHead.style #}) -splitTheFeather = #(define-music-function (parser location notes) (ly:music?) +scoop = #(define-music-function (parser location notes end) (ly:music? ly:music?) #{ - \temporary \override Staff.NoteHead.style = #'xcircle - $notes - \revert Staff.NoteHead.style + $notes ^\markup { \path + $end #}) +% stf = \splitTheFeather +% cart = \cartWheel +% fl = \flourish + % ================================================= % % Functions % % ================================================= % +% triplet +triplet = #(define-music-function (parser location notes) (ly:music?) + #{ \tuplet 3/2 { $notes } #} + ) + % dynamics v = #(define-event-function (parser location) () #{ \upbow #} @@ -319,4 +332,4 @@ sruff = #(define-music-function (parser location note) (ly:music?) #{ #{ \sruffd #}) % print the note, else it won't show up $note -#}) \ No newline at end of file +#}) diff --git a/makedrum b/makedrum index 72a5d13..8c45264 100755 --- a/makedrum +++ b/makedrum @@ -13,10 +13,11 @@ class MakeDrum: VERSION = '0.7' TMP_DIR = './tmp' TMP_PREFIX = 'tmp_' + MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) + RUN_DIR = os.path.abspath(os.curdir) def __init__(self): # Gather options and create the template file - usage = __file__ parser = ArgumentParser(usage) @@ -27,6 +28,13 @@ class MakeDrum: action='store_true', dest='show_lilyversion', default=False, help='show Lilypond version and exit') + parser.add_argument('-x', '--drumfile', + dest='lilydrum', default='lilydrum.ly', + help='Use the specified file for drums') + parser.add_argument('-c', '--pipefile', + dest='lilypipe', default='bagpipe.ly', + help='Use the specified file for pipes') + parser.add_argument('-p', '--paper-size', dest='papersize', default='a4', help='Paper size. Default: A4') @@ -34,7 +42,7 @@ class MakeDrum: dest='orientation', default='landscape', help='Paper orientation. Default: landscape') parser.add_argument('-s', '--staff-size', - dest='staffsize', default='16', + dest='staffsize', default='20', help='Staff size. Default: 16pt.') parser.add_argument('-f', '--format', dest='format', default=None, @@ -49,6 +57,9 @@ class MakeDrum: parser.add_argument('--no-cleanup', action='store_false', dest='clean', default=True, help='Leave all temporary files in place') + parser.add_argument('-d', '--out_dir', + dest='out_dir', default='pdf', + help='Output dir, for lilypond. If it doesn\'t exist, try to create it') parser.add_argument('music_file', default='', nargs='+', help='file to process') @@ -58,6 +69,7 @@ class MakeDrum: self.args = parser.parse_args() + print(self.RUN_DIR) if self.args.show_version: print(__name__, ' ', self.VERSION) return @@ -84,17 +96,24 @@ class MakeDrum: except: print('Seems like no temporary directory can be created') return + if not os.path.exists(os.path.join(os.path.curdir, self.args.out_dir)): + try: os.makedirs(os.path.join(os.path.curdir, self.args.out_dir)) + except: + print('Seems like no output directory can be created') + return - + os.chdir(self.MASTER_DIR) for file_path in self.args.music_file: - self.processit(self.TMP_DIR, file_path) + self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path)) #if not #os.rmdir(self.TMP_DIR) + os.chdir(self.RUN_DIR) + def processit(self, tmp_dir, file): if self.args.log: - logfile = os.path.join(self.TMP_DIR, file.strip('.ly').replace('/', '-')+'.log') + logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).strip('.ly').replace('/', '-')+'.log') log = ' > '+logfile+' 2>&1' else: log = '' @@ -108,22 +127,51 @@ class MakeDrum: tmp_file = self.maketemplate(tmp_dir, file, header_format) print ('Compiling ', file, end=' ', flush=True) + if not self.args.log: + print() - lilycmd = self.LILYPOND+' --pdf --output=./pdf/'+os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('ly')+' '+tmp_file+log + lilyout = os.path.join(os.path.curdir, self.args.out_dir, os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('.ly')) + lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log if os.system(lilycmd) != 0: self.remove_tmp_dir = False print ('[Error]') - print (' ! Did not compile, please see the log at ', logfile) + if self.args.log: + print (' ! Did not compile, please see the log at ', logfile) else : print ('[OK]') - os.remove(logfile) - os.remove(tmp_file) + + if self.args.clean: + #remove files + if self.args.log: + os.remove(logfile) + os.remove(tmp_file) def maketemplate(self, tmp_dir, file, header_format): + lily_includes = '' + include_drum_file = False + include_pipe_file = False + # find out whether drum, pipes, or full score + for ext in ['.full', '.side', '.tenor', '.bass', '.drum', '.snare']: + if ext in file: + include_drum_file = True + + for ext in ['.full', '.pipes']: + if ext in file: + include_pipe_file = True + + if include_drum_file: + lily_includes = lily_includes + u""" +\\include \""""+self.args.lilydrum+"""\" +""" + if include_pipe_file: + lily_includes = lily_includes + u""" +\\include \""""+self.args.lilypipe+"""\" +""" + # set up a tmp file with template and file combined - tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + file.replace('/', '-')) + tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-')) out_file = codecs.open(tmp_file, 'w+', 'utf8') out_file.write(u'\ufeff') @@ -139,8 +187,7 @@ class MakeDrum: #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") \\include "../"""+header_format+""".ily" -\\include "lilydrum.ly" - +"""+ lily_includes +""" % Local tweaks \\paper { ragged-bottom = ##t @@ -171,4 +218,4 @@ class MakeDrum: return tmp_file -MakeDrum(); \ No newline at end of file +MakeDrum(); diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly new file mode 100755 index 0000000..03b1cef --- /dev/null +++ b/other/band_of_brothers.snare.ly @@ -0,0 +1,50 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new DrumStaff = "staff_snare" { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + + \drummode { + \time 3/4 + R1*4 + \bar "||" + s16^ \markup "A" + R1*35 + \bar "||" + + \time 4/4 + + s16^ \markup "B" + sn4 \tuplet 3/2 {r8 sn8 sn8 } r4 | + \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | + \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 + + \time 2/4 + + sn2:16( + + \time 4/4 + + \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8} \tuplet 3/2 { sn8 sn8 sn8} + \bar "||" + s16^\markup "C" + + \repeat volta 2 { + \grace sn8 sn4 \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | + \grace { sn16 sn16 sn16 sn16 } + } + + } + } + +} + + \header { + title = "Band of Brothers" + subtitle = "for the Edinburgh Military Tattoo 2005" + arranger = "Michael Kamen, arr. Richard Barriball" + instrument = "Snare Drum" + meter = "" + } diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly index ecc58fb..2c875c1 100755 --- a/standards/standards.tenor.ly +++ b/standards/standards.tenor.ly @@ -21,6 +21,7 @@ d8-> g d g | d4-> r | \bar "||" + \break \flourish { d4 d | g4 g | @@ -49,6 +50,7 @@ d8.-> g16 d8 g r g | d4-> d8 g d4 | \bar "||" + \break \flourish{ d4-> d d | g4-> g g | @@ -73,12 +75,13 @@ d8-^ g d g d-> g d g | d4-^ g d r | \bar "||" + \break \flourish { d4 d g g | d4 d g g | d4 d g g | } - \flourish d4 \flourish g \splitTheFeather d r | + \flourish d4 \flourish g d^\splitTheFeather r | } } @@ -93,14 +96,15 @@ \repeat volta 2 { \flourish d4. \flourish g | - \splitTheFeather d r | + d^\splitTheFeather r | d g | d8 r8 g8 d4. | \flourish d4. \flourish g | - \splitTheFeather d r | + d^\splitTheFeather r | d g | d8 r8 g8 d4. | \bar "||" + \break \flourish { d4. d | g g | @@ -110,7 +114,7 @@ g g | d g | } - \splitTheFeather d r | + d^\splitTheFeather r | } } @@ -118,4 +122,4 @@ \header { title = "6/8 Standards" } -} \ No newline at end of file +} diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly index b21417b..215a71b 100755 --- a/strathspeys/molly_connell.bass.ly +++ b/strathspeys/molly_connell.bass.ly @@ -3,7 +3,7 @@ \include "lilydrum.ly" \score { - \drums { + \drummode { \numericTimeSignature \time 4/4 diff --git a/TODO b/todo (hoofdletterconflict) similarity index 96% rename from TODO rename to todo (hoofdletterconflict) index 41f2f2e..ffa8f8b 100755 --- a/TODO +++ b/todo (hoofdletterconflict) @@ -26,5 +26,5 @@ TODO ups \up arrow-up scoop \scoop arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one] split the feather \stf \splitTheFeather xcircle - cartwheel \cart \cartwheel + cartwheel \cart \cartwheel circle with dot (further EUSPBA symbols) \ No newline at end of file From edd1abcaac42db99b47e1fc5e6c52afc8fb6ff6f Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Thu, 5 Nov 2015 01:39:52 +0100 Subject: [PATCH 19/33] Decided to split up my lilydrum file for now Especially for flourishing symbols Went for a special context, d/g still available in DrumStaff PipeBandDrumStaff has all characteristics of a regular PB DrumStaff Oh, entered another score :) --- lilydrum.ly | 321 +----------------- lilydrum/embellishments.ily | 93 +++++ lilydrum/flourish_symbols/butterfly.eps | 62 ++++ lilydrum/flourish_symbols/st_andrews_crss.eps | 107 ++++++ lilydrum/flourish_symbols/stop.eps | 50 +++ lilydrum/flourishing.ily | 45 +++ lilydrum/layout_tweaks.ily | 94 +++++ lilydrum/musical_functions.ily | 36 ++ lilydrum/special_sticking.ily | 21 ++ makedrum | 23 +- other/band_of_brothers.snare.ly | 111 +++++- strathspeys/molly_connell.bass.ly | 41 +-- todo (hoofdletterconflict) => todo | 0 13 files changed, 641 insertions(+), 363 deletions(-) create mode 100755 lilydrum/embellishments.ily create mode 100755 lilydrum/flourish_symbols/butterfly.eps create mode 100755 lilydrum/flourish_symbols/st_andrews_crss.eps create mode 100755 lilydrum/flourish_symbols/stop.eps create mode 100755 lilydrum/flourishing.ily create mode 100755 lilydrum/layout_tweaks.ily create mode 100755 lilydrum/musical_functions.ily create mode 100755 lilydrum/special_sticking.ily rename todo (hoofdletterconflict) => todo (100%) diff --git a/lilydrum.ly b/lilydrum.ly index 81a77e6..ee38e94 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -3,12 +3,12 @@ LilyPond file definitions for Pipeband drumming scores. Primarily focused on Snare drumming, occasional bass or tenor scores should be possible. - Especially with the use of an external eps file with flourishi symbols This file builds on work done by Simon Froger. + Substantial changes by ET de Boone, Seaforth Highlanders of Holland (seaforth.nl) Include by using : - \include "[path]/lilydrum.ly" + \include "[pathtothisfile]" e.g. "~/lilydrum.ly" Music has to be put into : \new DrumStaff { @@ -18,318 +18,17 @@ } %} -#(ly:set-option 'point-and-click #f) % Note name defs : % "d" for the right hand ("droite") and % "g" for the left hand ("gauche") +%----------------------------------------- -drumPitchNames = -#(append '( - (d . right-hand) - (g . left-hand) - (right . right-hand) - (left . left-hand) +#(ly:set-option 'point-and-click #f) +#(ly:set-option 'relative-includes #t) - (dback . right-backstick) - (gback . left-backstick) - (rightback . right-backstick) - (leftback . left-backstick) - - (dcross . right-crossstick) - (gcross . right-crossstick) - (rightcross . right-crossstick) - (leftcross . right-crossstick) - ) - drumPitchNames -) - -% Position according to the line : right hand above and left hand below -#(define pipeband-style '( - (right-hand () #f 1) - (left-hand () #f -1) - (right-crossstick cross #f 1) - (left-crossstick cross #f -1) - (right-backstick xcircle #f 1) - (left-backstick xcircle #f -1) - ) -) -% Built-in noteheads: default, cross, xcircle, diamond - -% =================================================== % -% Layout tweaks for good defaults % -% =================================================== % -\layout { - \context { - \DrumStaff - - % add hands to note definitions - drumStyleTable = #(alist->hash-table pipeband-style) - - % one line per staff - \override StaffSymbol.line-positions = #'(0) - - % stems - \override Stem.direction = #DOWN % stems down - \override Stem.length = #9 % unbeamed stems length - \override Stem.stemlet-length = #1.5 % short stem length - - % beams - \override Beam.beam-thickness = #0.4 % beam-thickness - \override Beam.positions = #'(-3.8 . -3.8) % fix beams on one height - - % slurs and ties - \override Slur.direction = #UP % Slurs on top - \override Tie.direction = #UP % Ties on top - - % dynamics up - \dynamicUp - - % slurs below rolls number - %\override TextScript.outside-staff-priority = ##f - %\override TextScript.side-axis = #0 - %\override TextScript.staff-padding = #3 - %\override TextScript.X-offset = #2 % padding to stems - %\override TextScript.extra-offset = #'(-0.3 . 0) - - % tremolos (rolls) - \override StemTremolo.slope = #0.5 % slope - \override StemTremolo.beam-width = #1.5 % beam-width - \override StemTremolo.beam-thickness = #0.3 % beam-thickness - \override StemTremolo.extra-offset = #'(0 . 0.3) % vertical pos. position - - %\override StemTremolo.Y-offset = #-2.8 - - % repeat brackets - \consists "Horizontal_bracket_engraver" - \override HorizontalBracket.staff-padding = #3.5 % staff-padding - \override HorizontalBracket.direction = #UP % brackets under thr staff - \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets - - } - \context { - \Score - - \override RehearsalMark.break-align-symbols = #'(clef) - \override RehearsalMark.padding = #3 - \override VoltaBracket.edge-height = #'(1.5 . 1.5) - } -} - -% =================================================== % -% Define some tweaks for printing nicely % -% =================================================== %\ - -eighthBeaming = { - \set Score.baseMoment = #(ly:make-moment 1 8) - \set Score.beatStructure = #'( 2 ) -} -sixteenthBeaming = { - \set Score.baseMoment = #(ly:make-moment 1 16) - \set Score.beatStructure = #'( 4 ) -} - -\layout{ - % no indent - indent = 0 - \context{ - \DrumStaff - % always numeric Time Signatures - \numericTimeSignature - - % bar line height - \override BarLine.bar-extent = #'(-2 . 2) - - % I like being able to identify the 8th notes - subdivideBeams = ##t - strictBeatBeaming = ##t - - \override TupletBracket.bracket-visibility = #'if-no-beams - } -} - -% ================================================= % -% Side Sticking (modifies note, or adds mark) % -% ================================================= % -backstick = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = \ - $notes - \revert Staff.NoteHead.style - #}) -crossstick = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'xcircle - $notes - \revert Staff.NoteHead.style - #}) -rimshot = #(define-music-function (parser location notes) (ly:music?) - #{ - $notes - - #}) - -% ================================================= % -% Tenor Flourishing % -% ================================================= % -splitTheFeather = \markup{ \musicglyph #"noteheads.s2xcircle"} -cartWheel = \markup { \musicglyph #"timesig.neomensural94" } -up = \markup { - % \combine - %\tiny \triangle ##t - \center-align \draw-line #'(0 . 2) - } - -flourish = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'cross - $notes - \revert Staff.NoteHead.style - #}) -scoop = #(define-music-function (parser location notes end) (ly:music? ly:music?) - #{ - $notes ^\markup { \path - $end - #}) - -% stf = \splitTheFeather -% cart = \cartWheel -% fl = \flourish - -% ================================================= % -% Functions % -% ================================================= % - -% triplet -triplet = #(define-music-function (parser location notes) (ly:music?) - #{ \tuplet 3/2 { $notes } #} - ) - -% dynamics -v = #(define-event-function (parser location) () - #{ \upbow #} -) - -% repeat brackets -dr = #(define-event-function (parser location) () - #{ \startGroup #} -) -fr = #(define-event-function (parser location) () - #{ \stopGroup #} -) - -% dynamics with extended lines -dynLine = #(define-music-function - (parser location text) - (markup?) - #{ - \once \override TextSpanner.style = #'line - \once \override TextSpanner.bound-details.left.text = \markup { - \combine - \draw-line #'(0 . -1) - \draw-line #'(1 . 0) - \dynamic #text - } - \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } - #}) - -tutti = #(define-event-function (parser location notes) (ly:music?) #{ - \startGroup - % still to add: a little 'u' - $notes - \stopGroup - #}) - -% ================================================= % -% Flams, Drags & the sort % -% ================================================= % -drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ - % Set settings - \stemUp - \once \override Beam.positions = #'(1.8 . 1.8) - \once \override DrumStaff.Stem.length = #5 - \override Flag.stroke-style = #"grace" - \override Score.GraceSpacing #'spacing-increment = #1 - \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) - - % Print notes - \grace $notes - - % Revert back - \revert Score.Stem #'beamlet-default-length - \revert Flag.stroke-style - \stemNeutral -#}) - - -% Flams -flamd = \drummode { \drumgrace { g8 } } % Flam right -flamg = \drummode { \drumgrace { d8 } } % Flam left -flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start repeat -flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat - -% Drags -dragd = \drummode { \drumgrace { g16[ g] }} % Drag right -dragg = \drummode { \drumgrace { d16[ d] }} % Drag left -dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % Drag right with start repeat -draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % Drag left with start repeat - -% Ruff -ruffg = \drummode { \drumgrace { g16[ d g] }} % Ruff right -ruffd = \drummode { \drumgrace { d16[ g d] }} % Ruff left -ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % Ruff right with start repeat -ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % Ruff left with start repeat - -% Swiss Ruff -sruffg = \drummode { \drumgrace { g16[ d d] }} % Swiss Ruff right -sruffd = \drummode { \drumgrace { d16[ g g] }} % Swiss Ruff left -sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % Swiss Ruff right with start repeat -sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % Swiss Ruff left with start repeat - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Embellishment functions, automatic left or right %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Flam -flam = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \flamg #} - #{ \flamd #}) - % print the note, else it won't show up - $note -#}) - -% Drag -drag = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \dragg #} - #{ \dragd #}) - % print the note, else it won't show up - $note -#}) - -% Ruff -ruff = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \ruffg #} - #{ \ruffd #}) - % print the note, else it won't show up - $note -#}) - -% Swiss Ruff -sruff = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \sruffg #} - #{ \sruffd #}) - % print the note, else it won't show up - $note -#}) +\include "lilydrum/layout_tweaks.ily" +\include "lilydrum/musical_functions.ily" +\include "lilydrum/embellishments.ily" +\include "lilydrum/flourishing.ily" +\include "lilydrum/special_sticking.ily" diff --git a/lilydrum/embellishments.ily b/lilydrum/embellishments.ily new file mode 100755 index 0000000..73d4060 --- /dev/null +++ b/lilydrum/embellishments.ily @@ -0,0 +1,93 @@ +% ================================================= % +% Flams, Drags & the sort % +% ================================================= % +drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ + % Set settings + \stemUp + \once \override Beam.positions = #'(1.8 . 1.8) + \once \override DrumStaff.Stem.length = #5 + \override Flag.stroke-style = #"grace" + \override Score.GraceSpacing #'spacing-increment = #1 + \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) + + % Print notes + \grace $notes + + % Revert back + \revert Score.Stem #'beamlet-default-length + \revert Flag.stroke-style + \stemNeutral +#}) + + +% Flams +flamd = \drummode { \drumgrace { g8 } } % Flam right +flamg = \drummode { \drumgrace { d8 } } % Flam left +flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start repeat +flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat + +% Drags +dragd = \drummode { \drumgrace { g16[ g] }} % Drag right +dragg = \drummode { \drumgrace { d16[ d] }} % Drag left +dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % Drag right with start repeat +draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % Drag left with start repeat + +% Ruff +ruffg = \drummode { \drumgrace { g16[ d g] }} % Ruff right +ruffd = \drummode { \drumgrace { d16[ g d] }} % Ruff left +ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % Ruff right with start repeat +ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % Ruff left with start repeat + +% Swiss Ruff +sruffg = \drummode { \drumgrace { g16[ d d] }} % Swiss Ruff right +sruffd = \drummode { \drumgrace { d16[ g g] }} % Swiss Ruff left +sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % Swiss Ruff right with start repeat +sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % Swiss Ruff left with start repeat + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Embellishment functions, automatic left or right %% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% Flam +flam = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \flamg #} + #{ \flamd #}) + % print the note, else it won't show up + $note +#}) + +% Drag +drag = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \dragg #} + #{ \dragd #}) + % print the note, else it won't show up + $note +#}) + +% Ruff +ruff = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \ruffg #} + #{ \ruffd #}) + % print the note, else it won't show up + $note +#}) + +% Swiss Ruff +sruff = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \sruffg #} + #{ \sruffd #}) + % print the note, else it won't show up + $note +#}) diff --git a/lilydrum/flourish_symbols/butterfly.eps b/lilydrum/flourish_symbols/butterfly.eps new file mode 100755 index 0000000..ad99448 --- /dev/null +++ b/lilydrum/flourish_symbols/butterfly.eps @@ -0,0 +1,62 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner +%%Title: butterfly.eps +%%CreationDate: Tue Nov 3 18:58:20 2015 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%Pages: 1 +%%BoundingBox: 14 14 28 23 +%%EndComments +%%BeginProlog +% Use own dictionary to avoid conflicts +10 dict begin +%%EndProlog +%%Page: 1 1 +% Translate for offset +14.173228346456694 14.173228346456694 translate +% Translate to begin of first scanline +0 8 translate +13 -8 scale +% Image geometry +13 8 8 +% Transformation matrix +[ 13 0 0 8 0 0 ] +% Strings to hold RGB-samples per scanline +/rstr 13 string def +/gstr 13 string def +/bstr 13 string def +{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop} +{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop} +{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop} +true 3 +%%BeginData: 521 ASCII Bytes +colorimage +s8N,fqu$Hrp$r(^J,~> +s8N,fqu$Hrp$r(^J,~> +s8N,fqu$Hrp$r(^J,~> +%,Fub,@p3Al">-rJFS-~> +%,Fub,@p3Al">-rJFS-~> +%,Fub,@p3Al">-rJFS-~> +%!VFFnjYIn8*9jOooah~> +%!VFFnjYIn8*9jOooah~> +%!VFFnjYIn8*9jOooah~> +!3Z>$"7e/Pci*kDS:C~> +!3Z>$"7e/Pci*kDS:C~> +!3Z>$"7e/Pci*kDS:C~> +!4)S'".KO$rr2otR",~> +!4)S'".KO$rr2otR",~> +!4)S'".KO$rr2otR",~> +%#Fo_s2eEn(3KNTjbJ?~> +%#Fo_s2eEn(3KNTjbJ?~> +%#Fo_s2eEn(3KNTjbJ?~> +%,#f`D0l$Xfg[Vp@e"s~> +%,#f`D0l$Xfg[Vp@e"s~> +%,#f`D0l$Xfg[Vp@e"s~> +s8N,`p\b$no^Mn\J,~> +s8N,`p\b$no^Mn\J,~> +s8N,`p\b$no^Mn\J,~> +%%EndData +showpage +%%Trailer +end +%%EOF diff --git a/lilydrum/flourish_symbols/st_andrews_crss.eps b/lilydrum/flourish_symbols/st_andrews_crss.eps new file mode 100755 index 0000000..71dd630 --- /dev/null +++ b/lilydrum/flourish_symbols/st_andrews_crss.eps @@ -0,0 +1,107 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: cairo 1.14.2 (http://cairographics.org) +%%CreationDate: Wed Nov 4 14:58:05 2015 +%%Pages: 1 +%%DocumentData: Clean7Bit +%%LanguageLevel: 3 +%%BoundingBox: 0 -1 21 19 +%%EndComments +%%BeginProlog +save +50 dict begin +/q { gsave } bind def +/Q { grestore } bind def +/cm { 6 array astore concat } bind def +/w { setlinewidth } bind def +/J { setlinecap } bind def +/j { setlinejoin } bind def +/M { setmiterlimit } bind def +/d { setdash } bind def +/m { moveto } bind def +/l { lineto } bind def +/c { curveto } bind def +/h { closepath } bind def +/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto + 0 exch rlineto 0 rlineto closepath } bind def +/S { stroke } bind def +/f { fill } bind def +/f* { eofill } bind def +/n { newpath } bind def +/W { clip } bind def +/W* { eoclip } bind def +/BT { } bind def +/ET { } bind def +/pdfmark where { pop globaldict /?pdfmark /exec load put } + { globaldict begin /?pdfmark /pop load def /pdfmark + /cleartomark load def end } ifelse +/BDC { mark 3 1 roll /BDC pdfmark } bind def +/EMC { mark /EMC pdfmark } bind def +/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def +/Tj { show currentpoint cairo_store_point } bind def +/TJ { + { + dup + type /stringtype eq + { show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse + } forall + currentpoint cairo_store_point +} bind def +/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore + cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def +/Tf { pop /cairo_font exch def /cairo_font_matrix where + { pop cairo_selectfont } if } bind def +/Td { matrix translate cairo_font_matrix matrix concatmatrix dup + /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point + /cairo_font where { pop cairo_selectfont } if } bind def +/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def + cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def +/g { setgray } bind def +/rg { setrgbcolor } bind def +/d1 { setcachedevice } bind def +%%EndProlog +%%BeginSetup +%%EndSetup +%%Page: 1 1 +%%BeginPageSetup +%%PageBoundingBox: 0 -1 21 19 +%%EndPageSetup +q 0 -1 21 20 rectclip q +Q q +0 18.4 20.801 -18.398 re W n +q +0 18.4 21 -19 re W n +[ 0.8 0 0 0.8 0 -0.00000038147 ] concat +/DeviceRGB setcolorspace +8 dict dup begin + /ImageType 1 def + /Width 26 def + /Height 23 def + /Interpolate true def + /BitsPerComponent 8 def + /Decode [ 0 1 0 1 0 1 ] def + /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def + /ImageMatrix [ 1 0 0 -1 0 23 ] def +end +image +Gatm8gFo%9)#d/2gE[.Um;+hI3UEp%Xt3I?N/l1l9M:.%/M((/>\H_ta+]A=3YdQT;E&]$>p + h8S*.'p^e?KM&*c:JEl*lPlhY]"?n,#8_kBl([IGWlCjo:D5oCKl;_loW%4[;3Kfk`i84XJ!hG'9ZZkmI]J8tcC:B[7P)8U^Qges79AqoD2&" + uOF+^U@A0C*>jgD>CAK/&lJ9j'uVEpg"s`+"o;18kr!ISt:+ZmI'BL"Th:]!.gj=q^_R@ + X]DJQ$u5H]4b7UU=0]#?@q2[Ge^[ZUEJ&\*aYl%8>[`^T1GeWU:;>iV9u%AT&p-1*.r99JP + @%GUWrKf*?ai@Q._-:)H[E@o/:JKQ7L]d%@0Hh2Z.W<_Q7+NB"Dsb\.T!JW<%?&fO@G.<14 + RWqU/5`D!2En.g=c[pQ"ZSa])#]EAp.5+o("QE/hSbQ*:tO5,GV?I['$R7U:_JL91qo*-R[ + uH?9$s>q"VoB[\KV>aiWP:+r6*EZEeLiE$,pS6.O`E$X0%EG(m3STF.U$[%*#sWE+S@)%aar5I.TL"I"DT6HaWU0*<62pi1c@6K`%ma^jCCHHYL.#+pi]VpMi0/= + /R0o0hU+&=3a,W^+:nf*-78_W&F#ijXf\]IGeEbDG-hIM;gh-V8=a]5VA0ihIgKEj`7X2PR + ]-`3?68Nh%B8Mo)ReV]RB%3^':PN(W$]j)KQAFAu)?B=)\l,9DBMS\qn\QSR?F?*ak[[6UO + Uc(fHRFf\Fsj8uK!o;fUc($_un,Q4WseYD3Wq7Rpt%:.uWK*o=;.#s<5u#E+Lu*sDn-73Xj + $mjn=:YHJJCr%'<)QH"lqiM"_.0[tnHm$*a+md=r?4\5brK!qE0ba97&eXiYuWgdUAPsCGS + iUeN4IjIJuTL,)c==hP2jaV[oW1gH$ZDk+VCbh,sd2J*cEcMk">tF-*,B#?*i82/\4n9@l2 + JY#):A/5V5Q@+Tkl~> +Q +Q Q +showpage +%%Trailer +end restore +%%EOF diff --git a/lilydrum/flourish_symbols/stop.eps b/lilydrum/flourish_symbols/stop.eps new file mode 100755 index 0000000..a663d4d --- /dev/null +++ b/lilydrum/flourish_symbols/stop.eps @@ -0,0 +1,50 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner +%%Title: stop.eps +%%CreationDate: Wed Nov 4 21:02:56 2015 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%Pages: 1 +%%BoundingBox: 14 14 23 33 +%%EndComments +%%BeginProlog +% Use own dictionary to avoid conflicts +10 dict begin +%%EndProlog +%%Page: 1 1 +% Translate for offset +14.173228346456693 14.173228346456693 translate +% Translate to begin of first scanline +0 18.747656542932134 translate +8.2488188976377952 -18.747656542932134 scale +% Variable to keep one line of raster data +/scanline 9 3 mul string def +% Image geometry +9 17 8 +% Transformation matrix +[ 9 0 0 17 0 0 ] +{ currentfile scanline readhexstring pop } false 3 +%%BeginData: 946 ASCII Bytes +colorimage +fffffff5f5f5fffffffffffffffffffffffffffffffffffffcfcfc +fafafaffffff4e4e4e0000000000000000004e4e4effffffffffff +ffffff4e4e4e000000ffffffffffffffffff0000004e4e4effffff +ffffff000000ffffffffffffffffffffffffffffff000000ffffff +ffffff000000ffffffffffffffffffffffffffffff000000ffffff +ffffff000000ffffffffffffffffffffffffffffff000000ffffff +ffffff4e4e4e000000ffffffffffffffffff0000004e4e4effffff +ffffffffffff4e4e4e0000000000000000004e4e4efffffff5f5f5 +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +ffffffffffffffffffffffff000000ffffffffffffffffffffffff +000000000000000000000000000000000000000000000000000000 +%%EndData +showpage +%%Trailer +end +%%EOF diff --git a/lilydrum/flourishing.ily b/lilydrum/flourishing.ily new file mode 100755 index 0000000..d91569b --- /dev/null +++ b/lilydrum/flourishing.ily @@ -0,0 +1,45 @@ +% ================================================= % +% Tenor Flourishing % +% ================================================= % +% Part of lilydrum +splitTheFeather = \markup{ \musicglyph #"noteheads.s2xcircle"} +cartWheel = \markup { \musicglyph #"timesig.neomensural94" } +up = \markup { + %\center-column { + \combine + \draw-line #'(0 . -2) % draw stick + \combine % draw arrow + \draw-line #'(0.5 . -1) + \draw-line #'(-0.5 . -1) + %\arrow-head #Y #UP ##f + %} + } +bfly = \markup { + \epsfile #X #2 #"../lilydrum/flourish_symbols/butterfly.eps" +} +stop = \markup { + \epsfile #X #2 #"../lilydrum/flourish_symbols/stop.eps" + } +scoop = \markup { + \path #.2 #'( (moveto 0 0 ) + (lineto 3 1 ) + (lineto 6 0 ) + (lineto 7 1 ) + ) + } + +flourish = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'cross + $notes + \revert Staff.NoteHead.style + #}) +sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music?) + #{ + $notes + $end + #}) + +% stf = \splitTheFeather +% cart = \cartWheel +% fl = \flourish \ No newline at end of file diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily new file mode 100755 index 0000000..376059d --- /dev/null +++ b/lilydrum/layout_tweaks.ily @@ -0,0 +1,94 @@ +% =================================================== % +% Layout tweaks for good defaults % +% =================================================== % + +% Note name defs : +% "d" for the right hand ("droite") and +% "g" for the left hand ("gauche") +drumPitchNames = +#(append '( + (d . right-hand) + (g . left-hand) + (right . right-hand) + (left . left-hand) + ) + drumPitchNames +) + +% Position according to the line : right hand above and left hand below +#(define pipeband-style '( + (right-hand () #f 1) + (left-hand () #f -1) + ) +) +\layout { + \context {% add hands to note definitions + \DrumStaff + drumStyleTable = #(alist->hash-table pipeband-style) + } +} +\layout { + \context { + \DrumStaff + \name PipeBandDrumStaff + \alias DrumStaff + % one line per staff + \override StaffSymbol.line-positions = #'(0) + % bar line height + \override BarLine.bar-extent = #'(-2 . 2) + + % stems + \override Stem.direction = #DOWN % stems down + \override Stem.length = #9 % unbeamed stems length + \override Stem.stemlet-length = #1.5 % short stem length + + % beams + \override Beam.beam-thickness = #0.4 % beam-thickness + \override Beam.positions = #'(-3.8 . -3.8) % fix beams on one height + + % slurs and ties + \override Slur.direction = #UP % Slurs on top + \override Tie.direction = #UP % Ties on top + + % dynamics up + \dynamicUp + + % slurs below rolls number + %\override TextScript.outside-staff-priority = ##f + %\override TextScript.side-axis = #0 + %\override TextScript.staff-padding = #3 + %\override TextScript.X-offset = #2 % padding to stems + %\override TextScript.extra-offset = #'(-0.3 . 0) + + % tremolos (rolls) + \override StemTremolo.slope = #0.5 % slope + \override StemTremolo.beam-width = #1.5 % beam-width + \override StemTremolo.beam-thickness = #0.3 % beam-thickness + \override StemTremolo.extra-offset = #'(0 . 0.3) % vertical pos. position + + \override TupletBracket.bracket-visibility = #'if-no-beams + + % unison brackets + \consists "Horizontal_bracket_engraver" + \override HorizontalBracket.staff-padding = #3.5 % staff-padding + \override HorizontalBracket.direction = #UP % brackets above the staff + \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets + + subdivideBeams = ##t + strictBeatBeaming = ##t + \numericTimeSignature + + } + \context { + \Score + \accepts "PipeBandDrumStaff" + + \override RehearsalMark.break-align-symbols = #'(clef) + \override RehearsalMark.padding = #3 + \override VoltaBracket.edge-height = #'(1.5 . 1.5) + } + \context { + \StaffGroup + \accepts "PipeBandDrumStaff" + } +} \ No newline at end of file diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily new file mode 100755 index 0000000..81e49fd --- /dev/null +++ b/lilydrum/musical_functions.ily @@ -0,0 +1,36 @@ +% ================================================= % +% Musical Functions % +% ================================================= % +% Part of lilydrum + +% triplet +triplet = #(define-music-function (parser location notes) (ly:music?) #{ \tuplet 3/2 { $notes } #}) + +% dynamics +v = #(define-event-function (parser location) () #{ \upbow #}) + +% repeat brackets +dr = #(define-event-function (parser location) () #{ \startGroup #}) +fr = #(define-event-function (parser location) () #{ \stopGroup #}) + +% dynamics with extended lines +dynLine = #(define-music-function + (parser location text) + (markup?) + #{ + \once \override TextSpanner.style = #'line + \once \override TextSpanner.bound-details.left.text = \markup { + \combine + \draw-line #'(0 . -1) + \draw-line #'(1 . 0) + \dynamic #text + } + \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } + #}) + +% still to add: a little 'u' +tutti = #(define-event-function (parser location notes) (ly:music?) #{ + \startGroup + $notes + \stopGroup + #}) diff --git a/lilydrum/special_sticking.ily b/lilydrum/special_sticking.ily new file mode 100755 index 0000000..7d72d1e --- /dev/null +++ b/lilydrum/special_sticking.ily @@ -0,0 +1,21 @@ +% ================================================= % +% Side Sticking (modifies note, or adds mark) % +% ================================================= % +% Part of lilydrum +backstick = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'cross + $notes + \revert Staff.NoteHead.style + #}) +crossstick = #(define-music-function (parser location notes) (ly:music?) + #{ + \temporary \override Staff.NoteHead.style = #'xcircle + $notes + \revert Staff.NoteHead.style + #}) +rimshot = #(define-music-function (parser location notes) (ly:music?) + #{ + $notes + + #}) diff --git a/makedrum b/makedrum index 8c45264..29038a2 100755 --- a/makedrum +++ b/makedrum @@ -29,7 +29,7 @@ class MakeDrum: help='show Lilypond version and exit') parser.add_argument('-x', '--drumfile', - dest='lilydrum', default='lilydrum.ly', + dest='lilydrum', default='lilydrum/lilydrum.ly', help='Use the specified file for drums') parser.add_argument('-c', '--pipefile', dest='lilypipe', default='bagpipe.ly', @@ -69,7 +69,6 @@ class MakeDrum: self.args = parser.parse_args() - print(self.RUN_DIR) if self.args.show_version: print(__name__, ' ', self.VERSION) return @@ -113,7 +112,7 @@ class MakeDrum: def processit(self, tmp_dir, file): if self.args.log: - logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).strip('.ly').replace('/', '-')+'.log') + logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).replace(".ly", '').replace('/', '-')+'.log') log = ' > '+logfile+' 2>&1' else: log = '' @@ -130,7 +129,7 @@ class MakeDrum: if not self.args.log: print() - lilyout = os.path.join(os.path.curdir, self.args.out_dir, os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('.ly')) + lilyout = os.path.join(os.path.curdir, self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", '')) lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log if os.system(lilycmd) != 0: @@ -186,19 +185,9 @@ class MakeDrum: #(set-global-staff-size """+self.args.staffsize+""") #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") -\\include "../"""+header_format+""".ily" """+ lily_includes +""" -% Local tweaks -\\paper { - ragged-bottom = ##t -} -\layout { - \context { - \Score - % We only permit explicit line breaks - \override NonMusicalPaperColumn #'line-break-permission = ##f - } -} + +\\include \""""+header_format+""".ily" % The tune to generate. """) @@ -209,7 +198,7 @@ class MakeDrum: music = music.split(u'\n') printit = 1 for line in music: - if line.strip().startswith(u'\\include "lilydrum.ly"'): continue + if line.startswith(u'\\include "lilydrum.ly"'): continue if printit: out_file.write(line.replace('\r', '')+'\n') out_file.close() diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly index 03b1cef..f2e3d88 100755 --- a/other/band_of_brothers.snare.ly +++ b/other/band_of_brothers.snare.ly @@ -1,41 +1,122 @@ \version "2.18.2" -\include "lilydrum.ly" - +#(set-default-paper-size "a4" 'landscape) +#(set-global-staff-size 19) +\layout { + indent = 0 +\set Score.markFormatter = #format-mark-box-alphabet + \context { + \DrumStaff + % one line per staff + \override StaffSymbol.line-positions = #'(0) + \numericTimeSignature + } +} \score { \new DrumStaff = "staff_snare" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \drummode { + \compressMMRests { + \tempo 2. = 32 \time 3/4 - R1*4 + \override MultiMeasureRest.expand-limit = #3 + R2.*4 + } + \compressMMRests { \bar "||" - s16^ \markup "A" - R1*35 + \mark \default + R2.*35 + } \bar "||" - + \tempo 4 = 108 + \mark \default \time 4/4 - - s16^ \markup "B" - sn4 \tuplet 3/2 {r8 sn8 sn8 } r4 | + sn4 \f \tuplet 3/2 {r8 sn8 sn8 } r4 sn4 | \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 + | \time 2/4 sn2:16( + | \time 4/4 \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8} \tuplet 3/2 { sn8 sn8 sn8} - \bar "||" - s16^\markup "C" - \repeat volta 2 { + \bar "||" + \mark \default + \repeat percent 7{ \grace sn8 sn4 \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | - \grace { sn16 sn16 sn16 sn16 } + \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | } + \grace sn16 \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 sn2:32( | + \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 \grace {sn16 sn16} sn4 \grace {sn16 sn16} sn4 | + + \bar "||" + \mark \default + \repeat percent 10 { + \grace {sn16} sn4 \mf \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 { sn8 sn8 sn8} | + } + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 \mf\< sn8 } + \tuplet 3/2 { r8 sn8 sn8 } + \tuplet 3/2 { sn4 sn8 } + \tuplet 3/2 { sn8 sn8 sn8 \! } + | + + \grace { sn16 sn sn sn} \tuplet 3/2 { sn4 \f sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | + + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | + sn1:32( + + \bar "||" + \mark \default + sn8) \f r8 r4 r2 | + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \grace {sn16} sn8 r8 r4 r2 + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \bar "||" + \mark \default + + \repeat percent 3 { + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + } + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } \grace sn16 \tuplet 3/2 { sn8 sn sn} | + \repeat percent 3 { + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + } + \tuplet 3/2 {sn4 \< sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \tuplet 3/2 { sn4 \ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } + sn8 r8 r4 r2 | + + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn sn } + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn } | + \tuplet 3/2 { sn4 \fp\< sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \bar "||" + \tuplet 3/2 { sn4\ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + sn8 r8 r4 sn4:32( sn4:32)( | + \tuplet 3/2 { sn8) sn8 r8 } \tuplet 3/2 { r8 sn8 sn8 } sn8 r8 r4 + + + + } } diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly index 215a71b..f5ac633 100755 --- a/strathspeys/molly_connell.bass.ly +++ b/strathspeys/molly_connell.bass.ly @@ -1,31 +1,32 @@ -\version "2.18.2" - -\include "lilydrum.ly" - \score { - \drummode { - \numericTimeSignature + \new DrumStaff = "staff_bass"{ + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = #"Bass" + \set Staff.shortInstrumentName = #"B.D." + \time 4/4 + \numericTimeSignature - % Part 1 - \repeat volta 2 { - d4-> g4-> d4 g4 | - d4 g4 d4 g4 | - d4-> g4 d4 g4 | - d4-> g4 d8.-> g16 d4 | - - \break - d4-> g4-> d4 g4 | - r8 d8 r8 g8 r8 d8 r8 g8 | - d4-> g4 d4 g4 | - d4-> g4 r8. g16 d4 | + \drummode { + \repeat volta 2 { + d4-> g4-> d4 g4 | + d4 g4 d4 g4 | + d4-> g4 d4 g4 | + d4-> g4 d8.-> g16 d4 | + \break + d4-> g4-> d4 g4 | + r8 d8 r8 g8 r8 d8 r8 g8 | + d4-> g4 d4 g4 | + d4-> g4 r8. g16 d4 | + + } } } - header { + \header { title = "Molly Connell" composer = "W.H. de Boone / E.T. de Boone, 2014" instrument = "Bass Drum" meter = "STRATHSPEY" } -} \ No newline at end of file +} diff --git a/todo (hoofdletterconflict) b/todo similarity index 100% rename from todo (hoofdletterconflict) rename to todo From cd286256792323c118e29b010d7497da25bea439 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Thu, 5 Nov 2015 01:46:10 +0100 Subject: [PATCH 20/33] Created a nice Fullscore eventhough bass and tenor scores have to be written still path error in makedrum --- makedrum | 2 +- .../lady_mackenzie_of_fairburn.drums.ly | 169 ++++++++++++ .../lady_mackenzie_of_fairburn.full.ly | 244 ++++++++++++++++++ 3 files changed, 414 insertions(+), 1 deletion(-) create mode 100755 strathspeys/lady_mackenzie_of_fairburn.drums.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn.full.ly diff --git a/makedrum b/makedrum index 29038a2..2ff07bd 100755 --- a/makedrum +++ b/makedrum @@ -29,7 +29,7 @@ class MakeDrum: help='show Lilypond version and exit') parser.add_argument('-x', '--drumfile', - dest='lilydrum', default='lilydrum/lilydrum.ly', + dest='lilydrum', default='lilydrum.ly', help='Use the specified file for drums') parser.add_argument('-c', '--pipefile', dest='lilypipe', default='bagpipe.ly', diff --git a/strathspeys/lady_mackenzie_of_fairburn.drums.ly b/strathspeys/lady_mackenzie_of_fairburn.drums.ly new file mode 100755 index 0000000..f04b139 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn.drums.ly @@ -0,0 +1,169 @@ +%%%% SNARE DRUM %%%% +snareA = \drummode { + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. g16 + \triplet { d16 g d g d8 } + g8 g8 + | + d8[:32( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8.) s16 + } +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8:32( g8:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8. + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8[:32( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8.) s16 + } +snareBB = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8:32( g8:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + d8[:32( g8]:32)(-> + d8:32)( g8]:32)(-> + d4:32)(-> + d4) + + } +%%%% BASS DRUM %%%% +bassA = \drummode { + bd4 bd4-> r4 bd4 + | + bd4-> r4 bd4 r4 + | + bd4-> bd4 r4 bd4 + | + bd4 r4 bd4-> bd4 + } +bassBA = \drummode { + s16 | + s1*4 + } +bassBB = \drummode { + s16 | + s1*4 + } +%%%% TENOR DRUM %%%% +tenorA = \drummode { + d8.[ g16] + d4^\splitTheFeather + r4 + << d4 g4 >> + | \flourish{ + d4 + g4 + d4 + g4 + } | + d4 + r16 g d-> r + r8. g16 + d4 + | + d4 + g4 + d4 + r4 + } +tenorBA = \drummode { + s16 | + s1^\bfly s1 + s1*2 + } +tenorBB = \drummode { + s16 | + s1*4 + } + +formatA = { % Part 1 + \repeat volta 2 { + \repeat unfold 4 { s1 | } + } + \break + } +formatBA = { % Part 2.1 + \partial 16 s16 | + \repeat unfold 4 { s1 | } + \break + } + +formatBB = { % Part 2.2 + \partial 16 s16 | + \repeat unfold 4 { s1 | } + \bar "|." +} + +\score { + \new StaffGroup << + \new PipeBandDrumStaff { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + << + {\formatA \formatBA \formatBB} + { + \snareA + \snareBA \snareBB + } + >> + } + \new DrumStaff { + \set DrumStaff.instrumentName = #"Bass " + \set DrumStaff.shortInstrumentName = #"B.D. " + + \bassA + \bassBA \bassBB + } + \new DrumStaff { + \set DrumStaff.instrumentName = #"Tenor " + \set DrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorBA \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + composer = "E.T. de Boone" + } +} diff --git a/strathspeys/lady_mackenzie_of_fairburn.full.ly b/strathspeys/lady_mackenzie_of_fairburn.full.ly new file mode 100755 index 0000000..1db4691 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn.full.ly @@ -0,0 +1,244 @@ +pipesA = { + d16 | + \dblc c8. e16 + \dblA A4 + g16 f16 e8 + \dblA A4 + | + \hdblc c8. e16 + \dblA A8. d16 + \dblc c8. b16 + \grg a8. d16 + | + \dblc c8. e16 + \dblA A4 + g16 f e8 + \dblg g4 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg a8. s16 + } +pipesBA = { + d16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble e8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. s16 +} +pipesBB = { + A16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble d8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \grg e8. A16 + \hdblf g8. d16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. s16 + +} +snareA = \drummode { + s16 | + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. g16 + \triplet { d16 g d g d8 } + g8 g8 + | + d8[:32( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8.) s16 + } +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8:32( g8:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8. + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8[:32( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8[:32)( g8]:32)(-> + d8.) s16 + } +snareBB = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8:32( g8:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + d8[:32( g8]:32)(-> + d8:32)( g8]:32)(-> + d4:32)(-> + d4) + + } +bassA = \drummode { + s16 | + bd4 bd4-> r4 bd4 + | + bd4-> r4 bd4 r4 + | + bd4-> bd4 r4 bd4 + | + bd4 r4 bd4-> bd4 + } +bassBA = \drummode { + s16 | + s1*4 + } +bassBB = \drummode { + s16 | + s1*4 + } +tenorA = \drummode { + s16 | + d8.[ g16] + d4^\splitTheFeather + r4 + << d4 g4 >> + | \flourish{ + d4 + g4 + d4 + g4 + } | + d4 + r16 g d-> r + r8. g16 + d4 + | + d4 + g4 + d4 + r4 + } +tenorBA = \drummode { + s16 | + s1*2 + s1*2 + } +tenorBB = \drummode { + s16 | + s1*4 + } +formatA = { % Part 1 + \repeat volta 2 { + \partial 16 s16 | + \repeat unfold 4 { s1 | } + } + \break + } +formatBA = { % Part 2.1 + \partial 16 s16 | + \repeat unfold 4 { s1 | } + \break + } + +formatBB = { % Part 2.2 + \partial 16 s16 | + \repeat unfold 4 { s1 | } + \bar "|." +} + +\score { + \new StaffGroup << + \new Staff { + \bagpipeKey + \set Staff.instrumentName = #"Pipes " + \set Staff.shortInstrumentName = #"P. " + + \override KeySignature.stencil = ##f + + << + {\formatA \formatBA \formatBB} + {\pipesA \pipesBA \pipesBB} + >> + } + \new PipeBandDrumStaff { + \set DrumStaff.instrumentName = #"Side " + \set DrumStaff.shortInstrumentName = #"S.D. " + + \snareA + \snareBA \snareBB + } + \new DrumStaff { + \set DrumStaff.instrumentName = #"Bass " + \set DrumStaff.shortInstrumentName = #"B.D. " + + \bassA + \bassBA \bassBB + } + \new DrumStaff { + \set DrumStaff.instrumentName = #"Tenor " + \set DrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorBA \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + composer = "E.T. de Boone" + } +} From 34641ea7035f1f53fbb9df7e70c142ccfd73c033 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Thu, 5 Nov 2015 03:28:25 +0100 Subject: [PATCH 21/33] Edited scores to use PipeBandDrumStaff --- 2-4_marches/black_bear.side.ly | 5 +- 2-4_marches/black_bear.v1.2.side.ly | 3 +- 2-4_marches/black_bear.v1.3.side.ly | 2 +- 2-4_marches/duncan_mcinness.side.ly | 11 +- .../mackenzie_highlanders.alternate.side.ly | 8 +- 2-4_marches/mackenzie_highlanders.side.ly | 5 +- .../on_the_road_to_passchendaele.side.ly | 9 +- 4-4_marches/51st_highland_division.side.ly | 77 +++++----- 4-4_marches/flett_from_flotta.side.ly | 8 +- 4-4_marches/minstrel_boy.side.ly | 3 +- 4-4_marches/rowan_tree.side.ly | 49 +++--- 4-4_marches/scotland_the_brave.side.ly | 38 ++--- 4-4_marches/the_leaving_of_liverpool.side.ly | 44 +++--- 4-4_marches/the_old_rustic_bridge.tenor.ly | 3 +- 4-4_marches/the_pikemans_march.side.ly | 68 ++++----- 4-4_marches/the_pikemans_march.v1.5.side.ly | 3 +- 4-4_marches/were_no_awa_tae_bide_awa.side.ly | 3 +- 4-4_marches/wings.side.ly | 75 +++++---- 5-4_marches/cullen_bay.bass.ly | 9 +- 5-4_marches/cullen_bay.tenor.ly | 6 +- 6-8_marches/hills_of_glenorchy.snare.ly | 79 +++++----- airs/abide_with_me.side.ly | 6 +- airs/alexander_mackenzie.side.ly | 12 +- airs/amazing_grace.side.ly | 60 ++++---- airs/farewell_to_camraw.side.ly | 4 +- airs/farewell_to_camraw.tenor.ly | 2 +- airs/flower_of_scotland.side.ly | 3 +- airs/loch_duich.side.ly | 87 +++++------ airs/miss_kirkwood.side.ly | 53 +++---- airs/morag_of_dunvegan.side.ly | 49 +++--- airs/my_home.side.ly | 51 ++++--- airs/the_mist_covered_mountains.side.ly | 53 +++---- airs/the_mist_covered_mountains.tenor.ly | 2 +- hornpipes/itchy_fingers.side.ly | 75 ++++----- jigs/seaforth_sticks.side.ly | 68 +++++---- lilydrum/layout_tweaks.ily | 2 + lilydrum/musical_functions.ily | 9 ++ makedrum | 7 +- other/band_of_brothers.snare.ly | 13 +- standards/24_standards.side.ly | 10 +- standards/34_standards1.side.ly | 9 +- standards/34_standards2.side.ly | 8 +- standards/34_standards3.side.ly | 8 +- standards/44_standards.side.ly | 9 +- standards/68_standards.side.ly | 8 +- standards/standards.bass.ly | 68 +++++++-- standards/standards.tenor.ly | 143 +++++++++--------- strathspeys/aa_camerons.snare.ly | 75 ++++----- strathspeys/molly_connell.bass.ly | 6 +- strathspeys/molly_connell.side.ly | 47 +++--- strathspeys/molly_connell.tenor.ly | 41 ++--- 51 files changed, 800 insertions(+), 696 deletions(-) diff --git a/2-4_marches/black_bear.side.ly b/2-4_marches/black_bear.side.ly index feb177b..0c1ccc3 100755 --- a/2-4_marches/black_bear.side.ly +++ b/2-4_marches/black_bear.side.ly @@ -3,9 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 2/4 + \eighthBeaming + \drummode { % Part 1 \repeat volta 2 { \partial 8 d8:32( | @@ -40,6 +42,7 @@ \flamd d8 d8:32( g8) \bar "|." }% End of drums % + } \header { title = "Black Bear" diff --git a/2-4_marches/black_bear.v1.2.side.ly b/2-4_marches/black_bear.v1.2.side.ly index 710c759..95d94e8 100755 --- a/2-4_marches/black_bear.v1.2.side.ly +++ b/2-4_marches/black_bear.v1.2.side.ly @@ -3,8 +3,7 @@ \include "lilydrum.ly" \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/2-4_marches/black_bear.v1.3.side.ly b/2-4_marches/black_bear.v1.3.side.ly index 164a84a..132b3b6 100755 --- a/2-4_marches/black_bear.v1.3.side.ly +++ b/2-4_marches/black_bear.v1.3.side.ly @@ -5,7 +5,7 @@ yell = \markup { \bold \small HOY } \score { - \new DrumStaff = "staff_side" { + \new PipeBandDrumStaff = "staff_side" { \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/2-4_marches/duncan_mcinness.side.ly b/2-4_marches/duncan_mcinness.side.ly index 68cda82..1b6c293 100755 --- a/2-4_marches/duncan_mcinness.side.ly +++ b/2-4_marches/duncan_mcinness.side.ly @@ -3,8 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 2/4 + + \drummode { \repeat volta 2{ \partial 8 d8:32( | g8) d16. g32-> d16. d32 \flamg g8 | @@ -76,7 +79,7 @@ \flamd d8 d8:32( g4) \bar "|." } - \new DrumStaff{ + \new PipeBandDrumStaff{ \once \omit Staff.TimeSignature \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | d16. \flamg g32 d16. d32 \flamg g8 d8:32( | @@ -86,8 +89,8 @@ } >> } - }% End of drums % - + }% End of drums % + } \header { title = "Duncan McInness" meter = "Drum Salute in Quick Time" diff --git a/2-4_marches/mackenzie_highlanders.alternate.side.ly b/2-4_marches/mackenzie_highlanders.alternate.side.ly index 829a22b..fcb0893 100755 --- a/2-4_marches/mackenzie_highlanders.alternate.side.ly +++ b/2-4_marches/mackenzie_highlanders.alternate.side.ly @@ -1,5 +1,5 @@ \score { - \new DrumStaff = "staff_side" { + \new PipeBandDrumStaff = "staff_side" { \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." @@ -19,7 +19,7 @@ g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | - d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | d4:32( d8) } \break @@ -34,7 +34,7 @@ d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | - d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | d4:32( d8) g8 \bar "||" @@ -49,7 +49,7 @@ d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | - d8-> \drag d16 d32-> g d g \drag d16 d16. g32 | + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | d4:32( d4) \bar ":|" } diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly index 2a1132b..49be3ec 100755 --- a/2-4_marches/mackenzie_highlanders.side.ly +++ b/2-4_marches/mackenzie_highlanders.side.ly @@ -1,6 +1,5 @@ \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." @@ -13,7 +12,7 @@ g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - \flam g8 \drag d16. d32-> g16. \drag d32 d16. g32 | + \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | d4:32( d8) d8:32( | g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | diff --git a/3-4_marches/on_the_road_to_passchendaele.side.ly b/3-4_marches/on_the_road_to_passchendaele.side.ly index 4e4f6ce..b20daf1 100755 --- a/3-4_marches/on_the_road_to_passchendaele.side.ly +++ b/3-4_marches/on_the_road_to_passchendaele.side.ly @@ -3,8 +3,10 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 3/4 + + \drummode { \repeat volta 2{ \flamd d8. g16 d4:32( d8) d8:32( | \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | @@ -32,9 +34,8 @@ \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | d16. d32 \flamg g8 d4:32( d4) } - \break - }% End of drums % - + }% End of drums % + } \header { title = "On the Road to Passchendaele" meter = "Retreat" diff --git a/4-4_marches/51st_highland_division.side.ly b/4-4_marches/51st_highland_division.side.ly index f608998..49491ea 100755 --- a/4-4_marches/51st_highland_division.side.ly +++ b/4-4_marches/51st_highland_division.side.ly @@ -3,52 +3,53 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 - \repeat volta 2 { - \partial 8 d16. g32 | - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | + \drummode { + \repeat volta 2 { + \partial 8 d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | - } - \alternative { - { - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - \flamg g4 d4:32( d4) r8 } - { - d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | - \flamg g4 d4:32( d4) r8 + \alternative { + { + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + \flamg g4 d4:32( d4) r8 + } + { + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 + } } + + \break + d16. g32 | + d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + + \set Timing.measureLength = #(ly:make-moment 7/8) + \flamg g4 d4:32( d4) r8 + + \break + \set Timing.measureLength = #(ly:make-moment 1/8) + d16. g32 | + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 + }% End of drums % } - - \break - d16. g32 | - d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | - - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - - \set Timing.measureLength = #(ly:make-moment 7/8) - \flamg g4 d4:32( d4) r8 - - \break - \set Timing.measureLength = #(ly:make-moment 1/8) - d16. g32 | - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | - - d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | - \flamg g4 d4:32( d4) r8 - }% End of drums % - - -}\header { + \header { title = "51st Highland Division" meter = "March" composer = "" instrument = "Side" - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta.side.ly b/4-4_marches/flett_from_flotta.side.ly index 186660c..1baec6c 100755 --- a/4-4_marches/flett_from_flotta.side.ly +++ b/4-4_marches/flett_from_flotta.side.ly @@ -3,9 +3,9 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 - + \drummode { \repeat volta 2{ \partial 8 d8:32( | g8.) g16 d8:32( g8) d4:32( d8) d8:32( | @@ -32,8 +32,8 @@ d4)-> d4:32( d4) r8 } - }% End of drums % - + }% End of drums % + } \header { title = "Flett from Flotta" meter = "March" diff --git a/4-4_marches/minstrel_boy.side.ly b/4-4_marches/minstrel_boy.side.ly index e7c0439..84d8004 100755 --- a/4-4_marches/minstrel_boy.side.ly +++ b/4-4_marches/minstrel_boy.side.ly @@ -3,8 +3,7 @@ \include "lilydrum.ly" \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/4-4_marches/rowan_tree.side.ly b/4-4_marches/rowan_tree.side.ly index 45eb077..03a4d62 100755 --- a/4-4_marches/rowan_tree.side.ly +++ b/4-4_marches/rowan_tree.side.ly @@ -3,32 +3,35 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 + \eighthBeaming - % Part 1 - \repeat volta 2 { - \partial 4 - r8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) + \drummode { + % Part 1 + \repeat volta 2 { + \partial 4 + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + } + \break + % Part 2 ( Part 2.2 = Part 1) + d8. g16 | + d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) + }% End of drums % } - \break - % Part 2 ( Part 2.2 = Part 1) - d8. g16 | - d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - - r8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - }% End of drums % \header { title = "Rowan Tree" meter = "Quick March" diff --git a/4-4_marches/scotland_the_brave.side.ly b/4-4_marches/scotland_the_brave.side.ly index ac986fc..f5d0fe0 100755 --- a/4-4_marches/scotland_the_brave.side.ly +++ b/4-4_marches/scotland_the_brave.side.ly @@ -3,28 +3,30 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 + \eighthBeaming - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | - \flamd d4 d4:32( d4) r8 - } + \drummode { + % Part 1 + \repeat volta 2 { + \partial 8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | + \flamd d4 d4:32( d4) r8 + } - \break + \break - % Part 2 ( Part 2.2 = Part 1) - g8 | - d4:32( d8) g8 d4:32( d8) g8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d4 d4:32( d4) r8 - - }% End of drums % + % Part 2 ( Part 2.2 = Part 1) + g8 | + d4:32( d8) g8 d4:32( d8) g8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d4 d4:32( d4) r8 + }% End of drums % + } \header { title = "Scotland the Brave" meter = "Quick March" diff --git a/4-4_marches/the_leaving_of_liverpool.side.ly b/4-4_marches/the_leaving_of_liverpool.side.ly index 93fa397..4e5698e 100755 --- a/4-4_marches/the_leaving_of_liverpool.side.ly +++ b/4-4_marches/the_leaving_of_liverpool.side.ly @@ -3,40 +3,42 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 + \eighthBeaming - \repeat volta 2{ - \partial 4 r8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \drummode { + \repeat volta 2{ + \partial 4 r8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | - \flamd d4 d4:32( d4) - } - \break - \partial 4 \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + \flamd d4 d4:32( d4) + } + \break + \partial 4 \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | - \flamd d4 d4:32( d4) r8 + \flamd d4 d4:32( d4) r8 - \partial 4 \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + \partial 4 \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | + \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | - d4 d4:32( d4) r8 - - }% End of drums % + d4 d4:32( d4) r8 + }% End of drums % + } \header { title = "The Leaving of Liverpool" meter = "March" diff --git a/4-4_marches/the_old_rustic_bridge.tenor.ly b/4-4_marches/the_old_rustic_bridge.tenor.ly index d0b0e3c..a85557f 100755 --- a/4-4_marches/the_old_rustic_bridge.tenor.ly +++ b/4-4_marches/the_old_rustic_bridge.tenor.ly @@ -3,9 +3,10 @@ \include "lilydrum.ly" \score { - \new DrumStaff { + \new PipeBandDrumStaff { \drummode { \time 4/4 + \eighthBeaming \repeat volta 2 { \partial 16 g16 | diff --git a/4-4_marches/the_pikemans_march.side.ly b/4-4_marches/the_pikemans_march.side.ly index 9c743e5..43a8130 100755 --- a/4-4_marches/the_pikemans_march.side.ly +++ b/4-4_marches/the_pikemans_march.side.ly @@ -3,45 +3,43 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 + \eighthBeaming - \repeat volta 2 { - \partial 8 g8 | - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | - \flamd d4 d4:32( d4) r8 g8 | - \break - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | - \flamd d4 d4:32( d4) r8 - } - \break - \partial 8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | + \drummode { + \repeat volta 2 { + \partial 8 g8 | + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d4:32( d4) r8 g8 | + \break + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 - - - - - - }% End of drums % + \break + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 + }% End of drums % + } \header { title = "The Pikeman's March" meter = "March" diff --git a/4-4_marches/the_pikemans_march.v1.5.side.ly b/4-4_marches/the_pikemans_march.v1.5.side.ly index b4535b9..c7557b4 100755 --- a/4-4_marches/the_pikemans_march.v1.5.side.ly +++ b/4-4_marches/the_pikemans_march.v1.5.side.ly @@ -3,8 +3,7 @@ \include "lilydrum.ly" \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/4-4_marches/were_no_awa_tae_bide_awa.side.ly b/4-4_marches/were_no_awa_tae_bide_awa.side.ly index 38a741a..0019ddb 100755 --- a/4-4_marches/were_no_awa_tae_bide_awa.side.ly +++ b/4-4_marches/were_no_awa_tae_bide_awa.side.ly @@ -1,6 +1,5 @@ \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/4-4_marches/wings.side.ly b/4-4_marches/wings.side.ly index cd866af..f537fe2 100755 --- a/4-4_marches/wings.side.ly +++ b/4-4_marches/wings.side.ly @@ -3,51 +3,50 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 + \eighthBeaming - % Part 1 - \repeat volta 2 { - \partial 8 - d8:32)(^"Part 2 of 2" | - g8.) \parenthesize d16 d8:32( g8) r8 d32-> \dr g d g d-> g d g d8-> \fr | - \flamd d8 g16. d32-> g16. g32 \flamd d8 d4:32( d8) d16. g32 | - } - \alternative { - { - \break - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32( d8) \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | - \set Timing.measureLength = #(ly:make-moment 8/8) - \tuplet 3/2 { g16) d g } \flamd d8 d16. g32 \dragd d8 d32 g d g d8 d4:32( + \drummode { + % Part 1 + \repeat volta 2 { + \partial 8 + d8:32)(^"Part 2 of 2" | + g8.) \parenthesize d16 d8:32( g8) r8 d32-> \dr g d g d-> g d g d8-> \fr | + \flamd d8 g16. d32-> g16. g32 \flamd d8 d4:32( d8) d16. g32 | } - { - \break - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32)( d8) \flamg g8 d32 g d g d8 d16. g32 \dragd d8 | - \set Timing.measureLength = #(ly:make-moment 7/8) - d32 g d g d8 d4:32( d4) r8 + \alternative { + { + \break + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32( d8) \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | + \set Timing.measureLength = #(ly:make-moment 8/8) + \tuplet 3/2 { g16) d g } \flamd d8 d16. g32 \dragd d8 d32 g d g d8 d4:32( + } + { + \break + \set Timing.measureLength = #(ly:make-moment 4/4) + d4:32)( d8) \flamg g8 d32 g d g d8 d16. g32 \dragd d8 | + \set Timing.measureLength = #(ly:make-moment 7/8) + d32 g d g d8 d4:32( d4) r8 + } } - } - \bar "|." - \break - % Part 2 ( Part 2.2 = Part 1) - \set Timing.measureLength = #(ly:make-moment 1/8) - d8:32( | - \set Timing.measureLength = #(ly:make-moment 4/4) - g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> g8:32)(-> | - d8.)-> g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | - \break - \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 g d } \flamg g8 | - \flamd d4 r4 d8:32(-> g8:32)(-> d8:32)(-> g8:32)(-> \bar "|." - - - }% End of drums % - + \bar "|." + \break + % Part 2 ( Part 2.2 = Part 1) + \set Timing.measureLength = #(ly:make-moment 1/8) + d8:32( | + \set Timing.measureLength = #(ly:make-moment 4/4) + g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> g8:32)(-> | + d8.)-> g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | + \break + \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 g d } \flamg g8 | + \flamd d4 r4 d8:32(-> g8:32)(-> d8:32)(-> g8:32)(-> \bar "|." + }% End of drums % + } \header { title = "Wings" meter = "Quick March" - composer = "" instrument = "Side" } } \ No newline at end of file diff --git a/5-4_marches/cullen_bay.bass.ly b/5-4_marches/cullen_bay.bass.ly index 76b6148..33c2362 100755 --- a/5-4_marches/cullen_bay.bass.ly +++ b/5-4_marches/cullen_bay.bass.ly @@ -3,13 +3,14 @@ \include "lilydrum.ly" \score { - \new DrumStaff { + \new PipeBandDrumStaff { \time 5/4 - \repeat volta 2 { - \repeat unfold 8 { d4-^ g d-> g d | } + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4-^ g d-> g d | } + } } } - \header { title = "Cullen Bay" meter = "March" diff --git a/5-4_marches/cullen_bay.tenor.ly b/5-4_marches/cullen_bay.tenor.ly index e926c63..1742579 100755 --- a/5-4_marches/cullen_bay.tenor.ly +++ b/5-4_marches/cullen_bay.tenor.ly @@ -3,9 +3,10 @@ \include "lilydrum.ly" \score { - \new DrumStaff { + \new PipeBandDrumStaff { + \time 5/4 + \drummode { - \time 5/4 \repeat volta 4 { d8-> g d g d-> g d4 d4 | d8. g16 d8-> g8-> r8 g8 d4 d4 | @@ -19,7 +20,6 @@ } } } - \header { title = "Cullen Bay" meter = "March" diff --git a/6-8_marches/hills_of_glenorchy.snare.ly b/6-8_marches/hills_of_glenorchy.snare.ly index fe11062..a71f821 100755 --- a/6-8_marches/hills_of_glenorchy.snare.ly +++ b/6-8_marches/hills_of_glenorchy.snare.ly @@ -2,48 +2,51 @@ \include "lilydrum.ly" -\drums { - \time 6/8 +\score { + \new PipeBandDrumStaff { + \time 6/8 - % Part 1 - \repeat volta 2 { - \partial 8 d8 | - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | - d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | - d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | + \drummode { + % Part 1 + \repeat volta 2 { + \partial 8 d8 | + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | + d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | + d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | + + \break + + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) + + } \break - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) + % Part 2 ( Part 2.2 = Part 1) + \repeat volta 2 { + \tuplet 5/2 { d16 g d g d } | + g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | + g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 - } + \break - \break - - % Part 2 ( Part 2.2 = Part 1) - \repeat volta 2 { - \tuplet 5/2 { d16 g d g d } | - g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | - g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 - - \break - - \flamg g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) - } -}% End of drums % - -\header { - title = "Hills of Glenorchy" - meter = "March" - composer = "G. Clark, 1977" - instrument = "Side" + \flamg g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) + } + }% End of drums % + } + \header { + title = "Hills of Glenorchy" + meter = "March" + composer = "G. Clark, 1977" + instrument = "Side" + } } \ No newline at end of file diff --git a/airs/abide_with_me.side.ly b/airs/abide_with_me.side.ly index 0089db9..319ab92 100755 --- a/airs/abide_with_me.side.ly +++ b/airs/abide_with_me.side.ly @@ -1,12 +1,11 @@ \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." \time 4/4 \eighthBeaming - %\markup{ 1st time through rolls, n+1th time: n drums play score} + \drummode { \repeat unfold 3{ \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | @@ -28,5 +27,6 @@ \header { title = "Abide with Me" meter = "Hymn" + composer = "nth time through: n drums play score, others: rolls" } } diff --git a/airs/alexander_mackenzie.side.ly b/airs/alexander_mackenzie.side.ly index 2fd2656..f70da68 100755 --- a/airs/alexander_mackenzie.side.ly +++ b/airs/alexander_mackenzie.side.ly @@ -3,10 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - % Part 1 + \drummode { + % Part 1 \repeat volta 2 { \partial 8 d16. g32 | d8:32( d8.)-> g16 d4:32( d8) | @@ -25,7 +26,7 @@ \break - % Part 2 ( Part 2.2 = Part 1) + % Part 2 ( Part 2.2 = Part 1) d8:32( | g4) \flamd d16. g32 d8:32( g8) \flamd d8 | d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | @@ -53,9 +54,8 @@ d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | d4.:32( d4) \bar "|." - - }% End of drums % - + }% End of drums % + } \header { title = "Alexander MacKenzie" meter = "Slow March" diff --git a/airs/amazing_grace.side.ly b/airs/amazing_grace.side.ly index 81798f5..6e5136a 100755 --- a/airs/amazing_grace.side.ly +++ b/airs/amazing_grace.side.ly @@ -3,42 +3,42 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 3/4 - \partial 4 - \flamd d8. g16 | + \drummode { + \partial 4 + \flamd d8. g16 | - \repeat volta 2{ - \flamd d2)\! \flamd d8 g16 d16 | - \flamd d2 \flamd d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | - \break + \repeat volta 2{ + \flamd d2)\! \flamd d8 g16 d16 | + \flamd d2 \flamd d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | + \break - \flamd d2 \flamd d8 g16 d16 | - \flamd d2 \flamd d8. \flamg g16-> | - d4:32(\< d4:32)( d4:32)(\> | - d4:32)(\! d4:32)( d4:32)(\< | - \break + \flamd d2 \flamd d8 g16 d16 | + \flamd d2 \flamd d8. \flamg g16-> | + d4:32(\< d4:32)( d4:32)(\> | + d4:32)(\! d4:32)( d4:32)(\< | + \break - d2->)\! d8 g16 d16 | - \flamd d2 d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | - \break - - \flamd d2 d8 g16 d16 | - \flamd d2 \dragd d4 | - d4:32(\> d4:32)( d4:32)(\! | - d4:32)( d4:32)(\< d4:32)( - \break - \bar "||" - } - - - }% End of drums % + d2->)\! d8 g16 d16 | + \flamd d2 d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | + \break + \flamd d2 d8 g16 d16 | + \flamd d2 \dragd d4 | + d4:32(\> d4:32)( d4:32)(\! | + d4:32)( d4:32)(\< d4:32)( + \break + \bar "||" + } + \bar "|." + }% End of drums % + } \header { title = "Amazing Grace" meter = "Hymn" diff --git a/airs/farewell_to_camraw.side.ly b/airs/farewell_to_camraw.side.ly index 05d2dcf..f5e65bf 100755 --- a/airs/farewell_to_camraw.side.ly +++ b/airs/farewell_to_camraw.side.ly @@ -3,12 +3,12 @@ \include "lilydrum.ly" \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." \time 4/4 + \eighthBeaming \drummode { \repeat volta 2{ r1 | diff --git a/airs/farewell_to_camraw.tenor.ly b/airs/farewell_to_camraw.tenor.ly index d9c5dca..9a5db2d 100755 --- a/airs/farewell_to_camraw.tenor.ly +++ b/airs/farewell_to_camraw.tenor.ly @@ -3,7 +3,7 @@ \include "lilydrum.ly" \score { - \new DrumStaff { + \new PipeBandDrumStaff { \drummode { \time 4/4 \repeat volta 2 { diff --git a/airs/flower_of_scotland.side.ly b/airs/flower_of_scotland.side.ly index 1876c05..e9ac587 100755 --- a/airs/flower_of_scotland.side.ly +++ b/airs/flower_of_scotland.side.ly @@ -1,6 +1,5 @@ \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." diff --git a/airs/loch_duich.side.ly b/airs/loch_duich.side.ly index 4c0b5cd..bd466d0 100755 --- a/airs/loch_duich.side.ly +++ b/airs/loch_duich.side.ly @@ -3,57 +3,58 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | + \drummode { + \repeat volta 2 { + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | - } - \break - \repeat volta 2 { - d4)\! g8 d8:32( d8) g8 | - d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | - - \flamg g4 g8 d8:32( d8) g8 | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | - } - \break - \repeat volta 2 { - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d8 g16 d-> g g d4.:32(\< | - - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - } - \alternative { - { + \flamg g8 d8:32( d8) r8 d8:32( d8) | \dragd d16 d-> g g \flamd d8 d4.:32(\< | } - { - \dragd d16)\! d-> g g \flamd d8 \flamd d4. | - } - } - }% End of drums % + \break + \repeat volta 2 { + d4)\! g8 d8:32( d8) g8 | + d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | + \flamg g4 g8 d8:32( d8) g8 | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | + } + \break + \repeat volta 2 { + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d8 g16 d-> g g d4.:32(\< | + + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + } + \alternative { + { + \dragd d16 d-> g g \flamd d8 d4.:32(\< | + } + { + \dragd d16)\! d-> g g \flamd d8 \flamd d4. | + } + } + }% End of drums % + } \header { title = "Loch Duich" meter = "Slow Air" diff --git a/airs/miss_kirkwood.side.ly b/airs/miss_kirkwood.side.ly index 99bf0f1..a4a2466 100755 --- a/airs/miss_kirkwood.side.ly +++ b/airs/miss_kirkwood.side.ly @@ -3,34 +3,35 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - d4.:32( d4) g8 | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d2.:32(\< | - \break - d8)\! \flamg g8. g16 d4:32( d8) | - d8:32( d8.) g16 d4.:32( | - d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4) r8 - } - \break - \repeat volta 2 { - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | - \break - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4) r8 - } - }% End of drums % - + \drummode { + \repeat volta 2 { + d4.:32( d4) g8 | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d2.:32(\< | + \break + d8)\! \flamg g8. g16 d4:32( d8) | + d8:32( d8.) g16 d4.:32( | + d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4) r8 + } + \break + \repeat volta 2 { + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | + \break + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4) r8 + } + }% End of drums % + } \header { title = "Miss Kirkwood" meter = "Slow Air" diff --git a/airs/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan.side.ly index 699a120..4d8a6f6 100755 --- a/airs/morag_of_dunvegan.side.ly +++ b/airs/morag_of_dunvegan.side.ly @@ -3,34 +3,35 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 r8 d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + \drummode { + \repeat volta 2 { + \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 r8 d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - \break - \repeat volta 2 { - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - }% End of drums % + d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) + } + \break + \repeat volta 2 { + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) + } + }% End of drums % + } \header { title = "Morag of Dunvegan" meter = "Slow Air" diff --git a/airs/my_home.side.ly b/airs/my_home.side.ly index 66bae5c..c532bfc 100755 --- a/airs/my_home.side.ly +++ b/airs/my_home.side.ly @@ -3,33 +3,34 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - \partial 8 d8:32( | - g8.) d16 g8 \flamd d8. g16 d8 | - \flamg g8. d16 g8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) - } - \repeat volta 2 { - \partial 8 d8 | - \flamd d8. g16 d8 d4.:32( - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - \flamd d8. g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) - } - }% End of drums % - + \drummode { + \repeat volta 2 { + \partial 8 d8:32( | + g8.) d16 g8 \flamd d8. g16 d8 | + \flamg g8. d16 g8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) + } + \repeat volta 2 { + \partial 8 d8 | + \flamd d8. g16 d8 d4.:32( + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d8. g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) + } + }% End of drums % + } \header { title = "My Home" meter = "Slow Air" diff --git a/airs/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains.side.ly index fe8db3e..10897e1 100755 --- a/airs/the_mist_covered_mountains.side.ly +++ b/airs/the_mist_covered_mountains.side.ly @@ -3,34 +3,35 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - \partial 8 d8:32( | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d8)[ r8 d8:32(] | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d4.) | - } - \break - \repeat volta 2 { - \partial 8 d8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - d2.:32( | - d8.)-> g16 d8 g8 r8 g8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - r8 g8 d8 r8 d8 g8 | - d4.:32( d4.) | - } - }% End of drums % - + \drummode { + \repeat volta 2 { + \partial 8 d8:32( | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d8)[ r8 d8:32(] | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d4.) | + } + \break + \repeat volta 2 { + \partial 8 d8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + d2.:32( | + d8.)-> g16 d8 g8 r8 g8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + r8 g8 d8 r8 d8 g8 | + d4.:32( d4.) | + } + }% End of drums % + } \header { title = "The Mist Covered Mountains" meter = "Slow Air" diff --git a/airs/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains.tenor.ly index 8b4cc50..2bb4a0a 100755 --- a/airs/the_mist_covered_mountains.tenor.ly +++ b/airs/the_mist_covered_mountains.tenor.ly @@ -3,7 +3,7 @@ \include "lilydrum.ly" \score { - \new DrumStaff { + \new PipeBandDrumStaff { \drummode { \time 6/8 \repeat volta 2 { diff --git a/hornpipes/itchy_fingers.side.ly b/hornpipes/itchy_fingers.side.ly index dc0914f..3bdad69 100755 --- a/hornpipes/itchy_fingers.side.ly +++ b/hornpipes/itchy_fingers.side.ly @@ -3,55 +3,56 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 2/4 + \eighthBeaming - \repeat volta 2 { - \partial 8 r8 | - \flamd d16^"2 of 2"-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> d8:32( | + \drummode { + \repeat volta 2 { + \partial 8 r8 | + \flamd d16^"2 of 2"-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> d8:32( | - g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | - d16) g16-> d32 g d g d4:32( | + g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | + d16) g16-> d32 g d g d4:32( | - \break - \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> - } - \break - \repeat volta 2 { - \partial 8 d16 g16 | - d32-> g d g d g d g d16-> g d d | - g32-> d g d g-> d g d g16-> d g g | - - d32-> g d g d g d-> g d g d g d8-> | - d16-> d16:64( d16) g16 d4:32(-> | \break - } - \alternative { - { - d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | - d16 g16-> d32 g d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> - \break - } - { - d16[)-> g d \flamg g]-> d16 g \flamd d-> g | + \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | d16 \flamg g-> d g d8-> \flamd d16-> g16 | d32 g d g d16-> g16 d16 d16:64( d16) g16 | d8:32(-> g8:32)(-> d8)-> - \bar "|." } - } + \break + \repeat volta 2 { + \partial 8 d16 g16 | + d32-> g d g d g d g d16-> g d d | + g32-> d g d g-> d g d g16-> d g g | - }% End of drums % + d32-> g d g d g d-> g d g d g d8-> | + d16-> d16:64( d16) g16 d4:32(-> | + \break + } + \alternative { + { + d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | + d16 g16-> d32 g d g d8-> \flamd d16-> g16 | + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> + \break + } + { + d16[)-> g d \flamg g]-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> + \bar "|." + } + } + }% End of drums % + } \header { title = "Itchy Fingers" meter = "Hornpipe" diff --git a/jigs/seaforth_sticks.side.ly b/jigs/seaforth_sticks.side.ly index 4b37f4d..8ad3e86 100755 --- a/jigs/seaforth_sticks.side.ly +++ b/jigs/seaforth_sticks.side.ly @@ -3,15 +3,15 @@ \include "lilydrum.ly" \score { - \new DrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_side" { \set Staff.instrumentName = #"Side" \set Staff.shortInstrumentName = #"S.D." \time 6/8 \drummode { + \mark \default \repeat volta 2{ - \partial 8 r8^"A" | + \partial 8 r8 | \flamd d8 g8 d8 \flamg g4 g8 | d16 g d g d8-> g8 d8 g8 | @@ -26,8 +26,9 @@ } \break % B + \mark \default \repeat volta 2{ - \partial 8 g8^"B" | + \partial 8 g8 | d4.:32(-> d4.:32)(-> | d16) g d g d8-> g8 d8 g8 | @@ -42,8 +43,9 @@ } \break % C + \mark \default \repeat volta 2{ - \partial 8 d8:32(^"C" | + \partial 8 d8:32( | d4) \flamd d8 g8 d8 g8-^| d16 g d g d8 g8 d8 g8 | @@ -58,8 +60,9 @@ } \break % D + \mark \default \repeat volta 2{ - \partial 8 g8^"D" | + \partial 8 g8 | d4.:32(-> g8) d8 g8| d4.:32(-> g8) d8 g8| @@ -75,29 +78,31 @@ \break %E + \mark \default \repeat volta 2{ - \partial 8 r8^"E" | - \flamd d8 g8 d8 dback4 g8 | + \partial 8 r8 | + \flamd d8 g8 d8 \backstick d4 g8 | d16 g d g d8-> g8 d8 g8 | - \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | d4.:32(-> d8) g8 g8 | - \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | d16 g d g d8-> g8 d8 g8 | - \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | d4.:32( d4.) } \break % F + \mark \default \repeat volta 2{ - \partial 8 g8^"F" | + \partial 8 g8 | d4.:32(-> d4.:32)(-> | d16) g d g d8-> g8^"Y" d8 g8 | \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | - \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | d4.:32(-> d8) g8 g8 | d16 g d g d8-> g8 d8 g8 | @@ -106,44 +111,45 @@ d4.:32( d4.) } \break - % G + + \mark \default \repeat volta 2{ - \partial 8 d8:32(^"C" | - d4)-^ dback8 g8 d8 g8-^| + \partial 8 d8:32( | + d4)-^ \backstick d8 g8 d8 g8-^| d16 g d g d8 g8 d8 g8 | - \flamd d8 g8 d8 gback8 d8 g8 | - \flamd d8 g8 g8 dback4 d8:32( | + \flamd d8 g8 d8 \backstick g4 d8 g8 | + \flamd d8 g8 g8 \backstick d4 d8:32( | - d4)-> dback8 g8 d8 g8| + d4)-> \backstick d8 g8 d8 g8| d16 g d g d8-> g8 d8 g8 | - \flamd d8 g d8-> gback8 d8 g8 | + \flamd d8 g d8-> \backstick g4 d8 g8 | d4.:32( d4.) } \break % H + \mark \default \repeat volta 2{ - \partial 8 g8^"H" | - \flamd d8 d16 g16 d8 g8^"X" d8^"X" g8^"X"| + \partial 8 g8 | + \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| \flamd d8 g8 d8 g8^"Y" d8 g8| - \flamd d8 g8 d8 dback4 g8 | - \flamd d8 g8 d8 dback4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 d16 g16 d8 g8^"X" d8^"X" g8^"X"| + \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| \flamd d8 g8 d8 g8^"Y" d8 g8| - \flam d8 g8 d8 dback4 g8 | + \flam d8 g8 d8 \backstick d4 g8 | d4.:32( d4.) } } } - + \header { + title = "Seaforth Sticks" + meter = "Jig" + } } -\header { - title = "Seaforth Sticks" - meter = "Jig" -} \ No newline at end of file diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily index 376059d..b596672 100755 --- a/lilydrum/layout_tweaks.ily +++ b/lilydrum/layout_tweaks.ily @@ -32,8 +32,10 @@ drumPitchNames = \DrumStaff \name PipeBandDrumStaff \alias DrumStaff + % one line per staff \override StaffSymbol.line-positions = #'(0) + % bar line height \override BarLine.bar-extent = #'(-2 . 2) diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily index 81e49fd..4fb0211 100755 --- a/lilydrum/musical_functions.ily +++ b/lilydrum/musical_functions.ily @@ -3,6 +3,15 @@ % ================================================= % % Part of lilydrum +eighthBeaming = { + \set baseMoment = #(ly:make-moment 1/8) + \set beatStructure = #'( 2 ) +} +compoundEighthBeaming = { + \set baseMoment = #(ly:make-moment 1/8) + \set beatStructure = #'( 3 ) +} + % triplet triplet = #(define-music-function (parser location notes) (ly:music?) #{ \tuplet 3/2 { $notes } #}) diff --git a/makedrum b/makedrum index 2ff07bd..4fcefde 100755 --- a/makedrum +++ b/makedrum @@ -181,14 +181,13 @@ class MakeDrum: \\version "2.18.0" #(ly:set-option 'point-and-click #f) - -#(set-global-staff-size """+self.args.staffsize+""") -#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") - """+ lily_includes +""" \\include \""""+header_format+""".ily" +#(set-global-staff-size """+self.args.staffsize+""") +#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") + % The tune to generate. """) diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly index f2e3d88..f465711 100755 --- a/other/band_of_brothers.snare.ly +++ b/other/band_of_brothers.snare.ly @@ -4,7 +4,7 @@ #(set-global-staff-size 19) \layout { indent = 0 -\set Score.markFormatter = #format-mark-box-alphabet + \set Score.markFormatter = #format-mark-box-alphabet \context { \DrumStaff % one line per staff @@ -113,15 +113,8 @@ \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | sn8 r8 r4 sn4:32( sn4:32)( | \tuplet 3/2 { sn8) sn8 r8 } \tuplet 3/2 { r8 sn8 sn8 } sn8 r8 r4 - - - - } } - -} - \header { title = "Band of Brothers" subtitle = "for the Edinburgh Military Tattoo 2005" @@ -129,3 +122,7 @@ instrument = "Snare Drum" meter = "" } + +} + + diff --git a/standards/24_standards.side.ly b/standards/24_standards.side.ly index 041e1ff..52cf461 100755 --- a/standards/24_standards.side.ly +++ b/standards/24_standards.side.ly @@ -3,8 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 2/4 + + \drummode { \repeat volta 2{ \partial 8 d16. g32 | \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | @@ -59,9 +62,8 @@ g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | \flamd d8 d8:32( g8) } - - }% End of drums % - + }% End of drums % + } \header { title = "2/4 Standards" meter = "Quick March" diff --git a/standards/34_standards1.side.ly b/standards/34_standards1.side.ly index 0650fe6..2a6fed6 100755 --- a/standards/34_standards1.side.ly +++ b/standards/34_standards1.side.ly @@ -3,8 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 3/4 + + \drummode { \repeat volta 2{ \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | @@ -50,8 +53,8 @@ \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d4:32( d4) } - }% End of drums % - + }% End of drums % + } \header { title = "3/4 Standards\nSetting 1" meter = "Quick March" diff --git a/standards/34_standards2.side.ly b/standards/34_standards2.side.ly index 3fa339c..5d49f3a 100755 --- a/standards/34_standards2.side.ly +++ b/standards/34_standards2.side.ly @@ -3,8 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 3/4 + + \drummode { \repeat volta 2{ d4:32(-> d8) d8:32(-> d4) | \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | @@ -46,7 +49,8 @@ \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | \flamd d4 d4:32( d4) } - }% End of drums % + }% End of drums % + } \header { title = "3/4 Standards\n Setting 2" diff --git a/standards/34_standards3.side.ly b/standards/34_standards3.side.ly index b8cb71e..f3f2e1b 100755 --- a/standards/34_standards3.side.ly +++ b/standards/34_standards3.side.ly @@ -3,8 +3,11 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 3/4 + + \drummode { \repeat volta 2{ \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | d8) d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | @@ -50,7 +53,8 @@ \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | \flamd d4 d4:32( d4) } - }% End of drums % + }% End of drums % + } \header { title = "3/4 Standards\n Setting 3" diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly index 704b158..aa0797e 100755 --- a/standards/44_standards.side.ly +++ b/standards/44_standards.side.ly @@ -3,9 +3,10 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 2/4 + \drummode { \repeat volta 2{ \partial 8 r8 | R1 | @@ -17,7 +18,8 @@ g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | \flamd d8 d8:32( g8) } - }% End of drums % + }% End of drums % + } \header { title = "2/4 Standards" @@ -27,7 +29,8 @@ } } \score { - \drums { + \new PipeBandDrumStaff { + \eighthBeaming \time 4/4 \repeat volta 2{ \partial 8 d16. g32 | diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly index 0774057..b08a5ab 100755 --- a/standards/68_standards.side.ly +++ b/standards/68_standards.side.ly @@ -3,8 +3,10 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 + + \drummode { \repeat volta 2{ \partial 8 g8 | \flamd d4 d8:32( g4) d8:32( | @@ -76,8 +78,8 @@ \flamd d8. d16:64( d8) d4.:32( | d8.) g16 d8 \flamd d4 } - \break - }% End of drums % + }% End of drums % + } \header { title = "6/8 Standards" diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly index e9384ad..65d30de 100755 --- a/standards/standards.bass.ly +++ b/standards/standards.bass.ly @@ -2,17 +2,63 @@ \include "lilydrum.ly" -\score { - \new DrumStaff { - \time 2/4 - \repeat volta 2 { - \repeat unfold 8 { d4-> g4 } - } - } - - \header { - title = "Cullen Bay" - meter = "March" +\header { + title = "Standards" instrument = "Bass" } + +\score { + \new PipeBandDrumStaff { + \time 2/4 + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4-> g4 } + } + } + } + \header { + title = "2/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 3/4 + + \drummode { + \repeat volta 3 { + \repeat unfold 8 { d4-> g4 g4 } + } + } + } + \header { + title = "3/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 4/4 + + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4\v g4 d4-> g4} + } + } + } + \header { + title = "4/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 6/8 + + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4. g4. } + } + } + } + \header { + title = "6/8 Standard" + } } \ No newline at end of file diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly index 2c875c1..41cdf81 100755 --- a/standards/standards.tenor.ly +++ b/standards/standards.tenor.ly @@ -8,29 +8,31 @@ } \score { - \drums { + \new PipeBandDrumStaff { \time 2/4 - \repeat volta 2 { - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d4-> r | - \bar "||" - \break - \flourish { - d4 d | - g4 g | - d4 d | - g4 g | - d4 d | - g4 g | - d4 d | - g4 d | + \drummode { + \repeat volta 2 { + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d4-> r | + \bar "||" + \break + \flourish { + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 d | + } } } } @@ -41,21 +43,23 @@ } \score { - \drums { + \new PipeBandDrumStaff { \time 3/4 - \repeat volta 2 { - d8.-> g16 d8 g r g | - d4-> d8 g d4 | - d8.-> g16 d8 g r g | - d4-> d8 g d4 | - \bar "||" - \break - \flourish{ - d4-> d d | - g4-> g g | - d4-> d g | - g4-> d g | + \drummode { + \repeat volta 2 { + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + \bar "||" + \break + \flourish{ + d4-> d d | + g4-> g g | + d4-> d g | + g4-> d g | + } } } } @@ -66,22 +70,24 @@ } \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 - \repeat volta 2 { - d8-^ g d g d-> g d g | - d8-^ g d g d-> g d g | - d8-^ g d g d-> g d g | - d4-^ g d r | - \bar "||" - \break - \flourish { - d4 d g g | - d4 d g g | - d4 d g g | + \drummode { + \repeat volta 2 { + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d4-^ g d r | + \bar "||" + \break + \flourish { + d4 d g g | + d4 d g g | + d4 d g g | + } + \flourish d4 \flourish g d^\splitTheFeather r | } - \flourish d4 \flourish g d^\splitTheFeather r | } } @@ -91,31 +97,32 @@ } \score { - \drums { + \new PipeBandDrumStaff { \time 6/8 - \repeat volta 2 { - \flourish d4. \flourish g | - d^\splitTheFeather r | - d g | - d8 r8 g8 d4. | - \flourish d4. \flourish g | - d^\splitTheFeather r | - d g | - d8 r8 g8 d4. | - \bar "||" - \break - \flourish { - d4. d | - g g | - d d | - g g | - d d | - g g | + \drummode { + \repeat volta 2 { + \flourish d4. \flourish g | + d^\splitTheFeather r | d g | + d8 r8 g8 d4. | + \flourish d4. \flourish g | + d^\splitTheFeather r | + d g | + d8 r8 g8 d4. | + \bar "||" + \break + \flourish { + d4. d | + g g | + d d | + g g | + d d | + g g | + d g | + } + d^\splitTheFeather r | } - d^\splitTheFeather r | - } } diff --git a/strathspeys/aa_camerons.snare.ly b/strathspeys/aa_camerons.snare.ly index 80cd5b7..e20d762 100755 --- a/strathspeys/aa_camerons.snare.ly +++ b/strathspeys/aa_camerons.snare.ly @@ -2,47 +2,50 @@ \include "lilydrum.ly" -\drums { - \time 4/4 +\score { + \new PipeBandDrumStaff { + \time 4/4 - % Part 1 - \repeat volta 2 { - \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> | - d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } | - } - \alternative { - { - g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | - \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } + \drummode { + % Part 1 + \repeat volta 2 { + \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> | + d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } | } - { - g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | - \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } + \alternative { + { + g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | + \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } + } + { + g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | + \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } + } } - } - \break + \break - % Part 2 - \repeat volta 2 { - d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | - d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | - } - \alternative { - { - \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | - g8. d16 \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } + % Part 2 + \repeat volta 2 { + d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | + d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | } - { - \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | - d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } + \alternative { + { + \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | + g8. d16 \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } + } + { + \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | + d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } + } } - } -}% End of drums % - -\header { - title = "A. A. Cameron's Strathspey" - meter = "Strathspey" - composer = "G. Clark, 1988" - instrument = "Side" + }% End of drums % + } + \header { + title = "A. A. Cameron's Strathspey" + meter = "Strathspey" + composer = "G. Clark, 1988" + instrument = "Side" + } } \ No newline at end of file diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly index f5ac633..51e0d0f 100755 --- a/strathspeys/molly_connell.bass.ly +++ b/strathspeys/molly_connell.bass.ly @@ -1,11 +1,9 @@ \score { - \new DrumStaff = "staff_bass"{ - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff = "staff_bass"{ \set Staff.instrumentName = #"Bass" \set Staff.shortInstrumentName = #"B.D." \time 4/4 - \numericTimeSignature \drummode { \repeat volta 2 { @@ -19,7 +17,7 @@ r8 d8 r8 g8 r8 d8 r8 g8 | d4-> g4 d4 g4 | d4-> g4 r8. g16 d4 | - + } } } diff --git a/strathspeys/molly_connell.side.ly b/strathspeys/molly_connell.side.ly index 64c02b7..7b20bb3 100755 --- a/strathspeys/molly_connell.side.ly +++ b/strathspeys/molly_connell.side.ly @@ -3,35 +3,36 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 - \repeat volta 2 { - \partial 8 r8 - \flamd d4 \flamg g8.[ d16:64(] d8.[) \dragg g16] d8.[ g16] | - d8.:64[( g16]) \tuplet 3/2 { d16[ g d g d8]} \tuplet 3/2 { g8[ d8 \flamg g8] } \flamd d8.[ g16] | + \drummode { + \repeat volta 2 { + \partial 8 r8 + \flamd d4 \flamg g8.[ d16:64(] d8.[) \dragg g16] d8.[ g16] | + d8.:64[( g16]) \tuplet 3/2 { d16[ g d g d8]} \tuplet 3/2 { g8[ d8 \flamg g8] } \flamd d8.[ g16] | - d16:64[( d8.]) g8.[ \dragd d16] \tuplet 3/2 { d16[ g d g d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 - } - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | + d16:64[( d8.]) g8.[ \dragd d16] \tuplet 3/2 { d16[ g d g d8] } g8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 + } + \break + \partial 8 g8 | + d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | + \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - \tuplet 3/2 { \flamd d8[ g16 g16 d8] } g8.[ g16] \tuplet 3/2 { d8[ g16 g16 d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | + \tuplet 3/2 { \flamd d8[ g16 g16 d8] } g8.[ g16] \tuplet 3/2 { d8[ g16 g16 d8] } g8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | + \break + \partial 8 g8 | + d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | + \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - \flamd d4 \flamg g8.[ d16:64]( d8.[) \dragg g16] d8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - - \bar "|." - }% End of drums % + \flamd d4 \flamg g8.[ d16:64]( d8.[) \dragg g16] d8.[ g16] | + \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | + \bar "|." + }% End of drums % + } \header { title = "Molly Connell" meter = "Strathspey" diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly index 449a27f..fe8d116 100755 --- a/strathspeys/molly_connell.tenor.ly +++ b/strathspeys/molly_connell.tenor.ly @@ -3,30 +3,31 @@ \include "lilydrum.ly" \score { - \drums { + \new PipeBandDrumStaff { \time 4/4 - \repeat volta 2 { - d4 g4 d8. g16 d4 - d4 g4 r8. g16 d4 - d4 d4 g4 g4 - d4 g4 d4 g4 - } - \break - d4 g4 d4 g4 - d4 d8. g16 r8. g16 d4 - d4 g4 d8. g16 d4 - d4 g4 d4 g4 + \drummode { + \repeat volta 2 { + d4 g4 d8. g16 d4 + d4 g4 r8. g16 d4 + d4 d4 g4 g4 + d4 g4 d4 g4 + } + \break + d4 g4 d4 g4 + d4 d8. g16 r8. g16 d4 + d4 g4 d8. g16 d4 + d4 g4 d4 g4 - \break - d4 g4 d4 g4 - d4 d8. g16 r8. g16 d4 - d4 d4 g4 g4 - d4 g4 d4 g4 - \bar "|." - - }% End of drums % + \break + d4 g4 d4 g4 + d4 d8. g16 r8. g16 d4 + d4 d4 g4 g4 + d4 g4 d4 g4 + \bar "|." + }% End of drums % + } \header { title = "Molly Connell" meter = "Strathspey" From e5747677626dd40c74c59844452bf950a1f69f77 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 6 Nov 2015 15:13:11 +0100 Subject: [PATCH 22/33] Moved lilydrum directory small changes to headers --- {lilydrum => .lilydrum}/embellishments.ily | 0 .../flourish_symbols/butterfly.eps | 0 .../flourish_symbols/st_andrews_crss.eps | 0 .../flourish_symbols/stop.eps | 0 {lilydrum => .lilydrum}/flourishing.ily | 5 +---- {lilydrum => .lilydrum}/layout_tweaks.ily | 0 {lilydrum => .lilydrum}/musical_functions.ily | 0 {lilydrum => .lilydrum}/special_sticking.ily | 0 header_book.ily | 2 +- header_default.ily | 5 ++++- lilydrum.ly | 10 +++++----- makedrum | 9 +++++++++ strathspeys/molly_connell.tenor.ly | 20 +++++++++---------- 13 files changed, 30 insertions(+), 21 deletions(-) rename {lilydrum => .lilydrum}/embellishments.ily (100%) rename {lilydrum => .lilydrum}/flourish_symbols/butterfly.eps (100%) rename {lilydrum => .lilydrum}/flourish_symbols/st_andrews_crss.eps (100%) rename {lilydrum => .lilydrum}/flourish_symbols/stop.eps (100%) rename {lilydrum => .lilydrum}/flourishing.ily (90%) rename {lilydrum => .lilydrum}/layout_tweaks.ily (100%) rename {lilydrum => .lilydrum}/musical_functions.ily (100%) rename {lilydrum => .lilydrum}/special_sticking.ily (100%) diff --git a/lilydrum/embellishments.ily b/.lilydrum/embellishments.ily similarity index 100% rename from lilydrum/embellishments.ily rename to .lilydrum/embellishments.ily diff --git a/lilydrum/flourish_symbols/butterfly.eps b/.lilydrum/flourish_symbols/butterfly.eps similarity index 100% rename from lilydrum/flourish_symbols/butterfly.eps rename to .lilydrum/flourish_symbols/butterfly.eps diff --git a/lilydrum/flourish_symbols/st_andrews_crss.eps b/.lilydrum/flourish_symbols/st_andrews_crss.eps similarity index 100% rename from lilydrum/flourish_symbols/st_andrews_crss.eps rename to .lilydrum/flourish_symbols/st_andrews_crss.eps diff --git a/lilydrum/flourish_symbols/stop.eps b/.lilydrum/flourish_symbols/stop.eps similarity index 100% rename from lilydrum/flourish_symbols/stop.eps rename to .lilydrum/flourish_symbols/stop.eps diff --git a/lilydrum/flourishing.ily b/.lilydrum/flourishing.ily similarity index 90% rename from lilydrum/flourishing.ily rename to .lilydrum/flourishing.ily index d91569b..0b47364 100755 --- a/lilydrum/flourishing.ily +++ b/.lilydrum/flourishing.ily @@ -8,10 +8,7 @@ up = \markup { %\center-column { \combine \draw-line #'(0 . -2) % draw stick - \combine % draw arrow - \draw-line #'(0.5 . -1) - \draw-line #'(-0.5 . -1) - %\arrow-head #Y #UP ##f + \arrow-head #Y #UP ##f %} } bfly = \markup { diff --git a/lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily similarity index 100% rename from lilydrum/layout_tweaks.ily rename to .lilydrum/layout_tweaks.ily diff --git a/lilydrum/musical_functions.ily b/.lilydrum/musical_functions.ily similarity index 100% rename from lilydrum/musical_functions.ily rename to .lilydrum/musical_functions.ily diff --git a/lilydrum/special_sticking.ily b/.lilydrum/special_sticking.ily similarity index 100% rename from lilydrum/special_sticking.ily rename to .lilydrum/special_sticking.ily diff --git a/header_book.ily b/header_book.ily index b4e9177..6e0e8e1 100755 --- a/header_book.ily +++ b/header_book.ily @@ -10,7 +10,7 @@ today = #(strftime "%B %e, %Y" (localtime (current-time))) raggedbottom = ##t tagline = \markup { \line { - "Cpl Eric Teunis de Boone, Seaforths of Holland," + "Cpl ET de Boone, Seaforths of Holland," \concat { "(rev. " \today ")" } } } diff --git a/header_default.ily b/header_default.ily index 2be6319..5359785 100755 --- a/header_default.ily +++ b/header_default.ily @@ -23,7 +23,10 @@ today = #(strftime "%B %e, %Y" (localtime (current-time))) \bold \fromproperty #'header:subtitle } \fromproperty #'header:meter - \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + \column { + \fromproperty #'header:instrument + \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + } } $(if (not (ly:get-option 'without-comment)) (markup #:justify-field 'header:comment) diff --git a/lilydrum.ly b/lilydrum.ly index ee38e94..f905bcd 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -27,8 +27,8 @@ #(ly:set-option 'point-and-click #f) #(ly:set-option 'relative-includes #t) -\include "lilydrum/layout_tweaks.ily" -\include "lilydrum/musical_functions.ily" -\include "lilydrum/embellishments.ily" -\include "lilydrum/flourishing.ily" -\include "lilydrum/special_sticking.ily" +\include ".lilydrum/layout_tweaks.ily" +\include ".lilydrum/musical_functions.ily" +\include ".lilydrum/embellishments.ily" +\include ".lilydrum/flourishing.ily" +\include ".lilydrum/special_sticking.ily" diff --git a/makedrum b/makedrum index 4fcefde..50e836b 100755 --- a/makedrum +++ b/makedrum @@ -122,6 +122,8 @@ class MakeDrum: header_format = "header_book" else: header_format = "header_default" + else: + header_format = "header_" + self.args.format tmp_file = self.maketemplate(tmp_dir, file, header_format) @@ -198,6 +200,13 @@ class MakeDrum: printit = 1 for line in music: if line.startswith(u'\\include "lilydrum.ly"'): continue + if line.startswith(u'\\include'): + # Rewrite includes to absolute location of file + incline = line.replace('\\include', '').strip('"\' ') + print("include "+incline) + if not incline.startswith('\\'): #already absolute + incline = os.path.join(os.path.relpath(os.path.dirname(file)), incline) + line = "\\include \""+incline+"\"" if printit: out_file.write(line.replace('\r', '')+'\n') out_file.close() diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly index fe8d116..bf68e89 100755 --- a/strathspeys/molly_connell.tenor.ly +++ b/strathspeys/molly_connell.tenor.ly @@ -10,20 +10,20 @@ \repeat volta 2 { d4 g4 d8. g16 d4 d4 g4 r8. g16 d4 - d4 d4 g4 g4 - d4 g4 d4 g4 + \flourish { d4 d4 g4 g4 } + \flourish d4 \flourish g4 d4^\up g4^\up } \break - d4 g4 d4 g4 - d4 d8. g16 r8. g16 d4 - d4 g4 d8. g16 d4 - d4 g4 d4 g4 + d4^\up g4^\up \flourish { d4 g4 } + d4 \parenthesize d8. g16 r8. g16 d4 + \flourish { d4 d4 g4 g4 } + \flourish d4 \flourish g4 d4^\up g4^\up \break - d4 g4 d4 g4 - d4 d8. g16 r8. g16 d4 - d4 d4 g4 g4 - d4 g4 d4 g4 + d4^\up g4^\up \flourish { d4 g4 } + d4 \parenthesize d8. g16 r8. g16 d4 + d4 g4 d8. g16 d4 + \flourish d4 \flourish g4 d4^\up g4^\up \bar "|." }% End of drums % From 637d6fbdcc321f31fee32056948ab1e1497d76b9 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 6 Nov 2015 15:15:26 +0100 Subject: [PATCH 23/33] Instead of creating files per tune, folders can be used to create the full and separate scores Though not yet sure whether to continue. This one works --- .../morag_of_dunvegan.bass.ly | 20 ++++++++++ .../morag_of_dunvegan.drums.ly | 39 +++++++++++++++++++ .../morag_of_dunvegan.format.ly | 4 ++ .../morag_of_dunvegan.notes.bass.ly | 23 +++++++++++ .../morag_of_dunvegan.notes.side.ly | 30 ++++++++++++++ .../morag_of_dunvegan.notes.tenor.ly | 29 ++++++++++++++ .../morag_of_dunvegan.side.ly | 20 ++++++++++ .../morag_of_dunvegan.tenor.ly | 20 ++++++++++ 8 files changed, 185 insertions(+) create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.format.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.side.ly create mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly new file mode 100755 index 0000000..2d1d63c --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "morag_of_dunvegan.format.ly" +\include "morag_of_dunvegan.notes.bass.ly" + +\score { + \new PipeBandDrumStaff { + \time 6/8 + << + {\formatA \formatB} + {\bassA \bassB} + >> + } + \header { + title = "Morag of Dunvegan" + meter = "Slow Air" + composer = "" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly new file mode 100755 index 0000000..117f76b --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly @@ -0,0 +1,39 @@ +\version "2.19.0" + +\include "morag_of_dunvegan.format.ly" +\include "morag_of_dunvegan.notes.bass.ly" +\include "morag_of_dunvegan.notes.tenor.ly" +\include "morag_of_dunvegan.notes.side.ly" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + \time 6/8 + << + { \formatA \formatB } + { \snareA \snareB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + \bassA + \bassB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorB + } + >> + \header { + title = "Morag of Dunvegan" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly new file mode 100755 index 0000000..85ddf11 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly @@ -0,0 +1,4 @@ +\version "2.19.0" + +formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } +formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly new file mode 100755 index 0000000..fc0d790 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly @@ -0,0 +1,23 @@ +% 6/8 Morag of Dunvegan +% Bass +\version "2.18.2" +bassA = \drummode { + d4. d8 r8 g8 | + d4. d8 g8 d8 | + d4. g8 d8 g8 | + d8 r8 g8 d4. | + d4. d8 r8 g8 | + d4. d8 g8 d8 | + d4. g8 d8 g8 | + d8 r8 g8 d4. | +} +bassB = \drummode { + d4. g4. | + d4. g4. | + d4. g8 d8 g8 | + d4 g8 d4. | + d4. g4. | + d4. g4. | + d4 g8 d4 g8 | + d8 g8 d8 g4. | +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly new file mode 100755 index 0000000..fac7c73 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly @@ -0,0 +1,30 @@ +% 6/8 Morag of Dunvegan +% Tenor +\version "2.18.2" +snareA = \drummode { + \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 r8 d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) +} + +snareB = \drummode { + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly new file mode 100755 index 0000000..6e5e020 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly @@ -0,0 +1,29 @@ +% 6/8 Morag of Dunvegan +% Tenor +\version "2.18.2" +tenorA = \drummode { + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4. | + + d8 r8 g8 d8 g8 d8 | + g8 r8 d8 g4. | + + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4.| + + d4 g8 d4 g8 | + d8 g8 d8 g4. +} +tenorB = \drummode { + d8 g8 d8 g8 d8 g8 | + d4. g4. | + + d8 g8 d8 g8 d8 g8 | + d4 g8 d4.| + + d8 g8 d8 g8 d8 g8 | + d4. g4. | + + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4. +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly new file mode 100755 index 0000000..ee55619 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "morag_of_dunvegan.format.ly" +\include "morag_of_dunvegan.notes.side.ly" + +\score { + \new PipeBandDrumStaff { + \time 6/8 + << + {\formatA \formatB} + {\snareA \snareB} + >> + } + \header { + title = "Morag of Dunvegan" + meter = "Slow Air" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly new file mode 100755 index 0000000..84cdf99 --- /dev/null +++ b/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "morag_of_dunvegan.format.ly" +\include "morag_of_dunvegan.notes.tenor.ly" + +\score { + \new PipeBandDrumStaff { + \time 6/8 + << + {\formatA \formatB} + {\tenorA \tenorB} + >> + } + \header { + title = "Morag of Dunvegan" + meter = "Slow Air" + composer = "" + instrument = "Tenor" + } +} \ No newline at end of file From 81255889cf73e4dc820136675352ddc340da91f9 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Mon, 9 Nov 2015 05:59:05 +0100 Subject: [PATCH 24/33] Changed setup for five scores Morag of Dunvegan Farewell to Camraw The Mist Covered Mountains Molly Connell Lady MacKenzie of Fairburn Note that Fairburn also has the tune itself. Fullscore prints nicely! --- .lilydrum/embellishments.ily | 4 +- .lilydrum/layout_tweaks.ily | 6 +- airs/farewell_to_camraw.side.ly | 31 --- airs/farewell_to_camraw.tenor.ly | 27 -- airs/farewell_to_camraw/config.ily | 9 + airs/farewell_to_camraw/drums.ly | 38 +++ airs/farewell_to_camraw/notes.side.ily | 13 + airs/farewell_to_camraw/notes.tenor.ily | 14 + airs/farewell_to_camraw/side.ly | 19 ++ airs/farewell_to_camraw/tenor.ly | 19 ++ airs/morag_of_dunvegan.side.ly | 41 --- .../{morag_of_dunvegan.bass.ly => bass.ly} | 7 +- airs/morag_of_dunvegan/config.ily | 9 + .../{morag_of_dunvegan.drums.ly => drums.ly} | 10 +- .../morag_of_dunvegan.format.ly | 4 - ..._dunvegan.notes.bass.ly => notes.bass.ily} | 0 ..._dunvegan.notes.side.ly => notes.side.ily} | 0 ...unvegan.notes.tenor.ly => notes.tenor.ily} | 0 .../{morag_of_dunvegan.side.ly => side.ly} | 7 +- .../{morag_of_dunvegan.tenor.ly => tenor.ly} | 7 +- airs/the_mist_covered_mountains/config.ily | 10 + airs/the_mist_covered_mountains/drums.ly | 39 +++ .../the_mist_covered_mountains/notes.side.ily | 23 ++ .../notes.tenor.ily | 25 ++ airs/the_mist_covered_mountains/side.ly | 19 ++ airs/the_mist_covered_mountains/tenor.ly | 19 ++ .../the_mist_covered_mountains.side.ly | 0 .../the_mist_covered_mountains.tenor.ly | 0 header_default.ily | 1 - makedrum | 6 +- .../lady_mackenzie_of_fairburn.drums.ly | 169 ------------ .../lady_mackenzie_of_fairburn.full.ly | 244 ------------------ .../lady_mackenzie_of_fairburn/bass.ly | 19 ++ .../lady_mackenzie_of_fairburn/config.ily | 9 + .../lady_mackenzie_of_fairburn/drums.ly | 43 +++ .../lady_mackenzie_of_fairburn/full.ly | 53 ++++ .../lady_mackenzie_of_fairburn/notes.bass.ily | 18 ++ .../notes.pipes.ily | 69 +++++ .../lady_mackenzie_of_fairburn/notes.side.ily | 68 +++++ .../notes.tenor.ily | 20 ++ .../lady_mackenzie_of_fairburn/pipes.ly | 20 ++ .../lady_mackenzie_of_fairburn/side.ly | 19 ++ .../lady_mackenzie_of_fairburn/tenor.ly | 19 ++ strathspeys/molly_connell.bass.ly | 30 --- strathspeys/molly_connell.side.ly | 42 --- strathspeys/molly_connell.tenor.ly | 37 --- strathspeys/molly_connell/bass.ly | 19 ++ strathspeys/molly_connell/config.ily | 8 + strathspeys/molly_connell/drums.ly | 66 +++++ strathspeys/molly_connell/notes.bass.ily | 15 ++ strathspeys/molly_connell/notes.side.ily | 27 ++ strathspeys/molly_connell/notes.tenor.ily | 21 ++ strathspeys/molly_connell/side.ly | 19 ++ strathspeys/molly_connell/tenor.ly | 19 ++ 54 files changed, 829 insertions(+), 651 deletions(-) delete mode 100755 airs/farewell_to_camraw.side.ly delete mode 100755 airs/farewell_to_camraw.tenor.ly create mode 100755 airs/farewell_to_camraw/config.ily create mode 100755 airs/farewell_to_camraw/drums.ly create mode 100755 airs/farewell_to_camraw/notes.side.ily create mode 100755 airs/farewell_to_camraw/notes.tenor.ily create mode 100755 airs/farewell_to_camraw/side.ly create mode 100755 airs/farewell_to_camraw/tenor.ly delete mode 100755 airs/morag_of_dunvegan.side.ly rename airs/morag_of_dunvegan/{morag_of_dunvegan.bass.ly => bass.ly} (63%) create mode 100755 airs/morag_of_dunvegan/config.ily rename airs/morag_of_dunvegan/{morag_of_dunvegan.drums.ly => drums.ly} (78%) delete mode 100755 airs/morag_of_dunvegan/morag_of_dunvegan.format.ly rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.bass.ly => notes.bass.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.side.ly => notes.side.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.notes.tenor.ly => notes.tenor.ily} (100%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.side.ly => side.ly} (64%) rename airs/morag_of_dunvegan/{morag_of_dunvegan.tenor.ly => tenor.ly} (64%) create mode 100755 airs/the_mist_covered_mountains/config.ily create mode 100755 airs/the_mist_covered_mountains/drums.ly create mode 100755 airs/the_mist_covered_mountains/notes.side.ily create mode 100755 airs/the_mist_covered_mountains/notes.tenor.ily create mode 100755 airs/the_mist_covered_mountains/side.ly create mode 100755 airs/the_mist_covered_mountains/tenor.ly rename airs/{ => the_mist_covered_mountains}/the_mist_covered_mountains.side.ly (100%) rename airs/{ => the_mist_covered_mountains}/the_mist_covered_mountains.tenor.ly (100%) delete mode 100755 strathspeys/lady_mackenzie_of_fairburn.drums.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn.full.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/bass.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/config.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/drums.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/full.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.side.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/pipes.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/side.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/tenor.ly delete mode 100755 strathspeys/molly_connell.bass.ly delete mode 100755 strathspeys/molly_connell.side.ly delete mode 100755 strathspeys/molly_connell.tenor.ly create mode 100755 strathspeys/molly_connell/bass.ly create mode 100755 strathspeys/molly_connell/config.ily create mode 100755 strathspeys/molly_connell/drums.ly create mode 100755 strathspeys/molly_connell/notes.bass.ily create mode 100755 strathspeys/molly_connell/notes.side.ily create mode 100755 strathspeys/molly_connell/notes.tenor.ily create mode 100755 strathspeys/molly_connell/side.ly create mode 100755 strathspeys/molly_connell/tenor.ly diff --git a/.lilydrum/embellishments.ily b/.lilydrum/embellishments.ily index 73d4060..00fcdb6 100755 --- a/.lilydrum/embellishments.ily +++ b/.lilydrum/embellishments.ily @@ -4,10 +4,10 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ % Set settings \stemUp - \once \override Beam.positions = #'(1.8 . 1.8) + \once \override Beam.positions = #'(2 . 2) \once \override DrumStaff.Stem.length = #5 \override Flag.stroke-style = #"grace" - \override Score.GraceSpacing #'spacing-increment = #1 + \override Score.GraceSpacing #'spacing-increment = #0 \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) % Print notes diff --git a/.lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily index b596672..769841c 100755 --- a/.lilydrum/layout_tweaks.ily +++ b/.lilydrum/layout_tweaks.ily @@ -41,8 +41,8 @@ drumPitchNames = % stems \override Stem.direction = #DOWN % stems down - \override Stem.length = #9 % unbeamed stems length - \override Stem.stemlet-length = #1.5 % short stem length + \override Stem.length = #8.5 % unbeamed stems length + \override Stem.stemlet-length = #1 % short stem length % beams \override Beam.beam-thickness = #0.4 % beam-thickness @@ -59,7 +59,7 @@ drumPitchNames = %\override TextScript.outside-staff-priority = ##f %\override TextScript.side-axis = #0 %\override TextScript.staff-padding = #3 - %\override TextScript.X-offset = #2 % padding to stems + %\override TextScript.X-offset = #1 % padding to stems %\override TextScript.extra-offset = #'(-0.3 . 0) % tremolos (rolls) diff --git a/airs/farewell_to_camraw.side.ly b/airs/farewell_to_camraw.side.ly deleted file mode 100755 index f5e65bf..0000000 --- a/airs/farewell_to_camraw.side.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \eighthBeaming - \drummode { - \repeat volta 2{ - r1 | - r1 | - \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | - \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | - \flamd d4 d32 g d g d g d g d4 r4 | - \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | - d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | - \flamd d8 \flamg g8 r4 r2 - } - } - } - -} - - \header { - title = "Farewell to Camraw" - meter = "Slow Air" - } \ No newline at end of file diff --git a/airs/farewell_to_camraw.tenor.ly b/airs/farewell_to_camraw.tenor.ly deleted file mode 100755 index 9a5db2d..0000000 --- a/airs/farewell_to_camraw.tenor.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \drummode { - \time 4/4 - \repeat volta 2 { - R1 - r8 g d16 g d g d8 g d16 g d g | - d8 g d16 g d g d4 d16 g d g | - d4 g16 d g d d4 r4 | - d4 d8 g d4 r4 | - d4 d8 g d4 r4 | - d8 g d g d4 d8 g | - d8 g r4 r2 | - } - } - } - - \header { - title = "Farewell to Camraw" - meter = "Slow Air" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily new file mode 100755 index 0000000..b6df39f --- /dev/null +++ b/airs/farewell_to_camraw/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } \ No newline at end of file diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly new file mode 100755 index 0000000..92f2d83 --- /dev/null +++ b/airs/farewell_to_camraw/drums.ly @@ -0,0 +1,38 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + \global + << + \formatA + \snareA + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = #"Bass " + % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + % + % \bassA + % \bassB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + } + >> + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily new file mode 100755 index 0000000..e2bb443 --- /dev/null +++ b/airs/farewell_to_camraw/notes.side.ily @@ -0,0 +1,13 @@ +% 4/4 Farewell to Camraw +% Side +\version "2.18.2" +snareA = \drummode { + r1 | + r1 | + \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | + \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | + \flamd d4 d32 g d g d g d g d4 r4 | + \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | + d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | + \flamd d8 \flamg g8 r4 r2 +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily new file mode 100755 index 0000000..5fa2cd2 --- /dev/null +++ b/airs/farewell_to_camraw/notes.tenor.ily @@ -0,0 +1,14 @@ +% 4/4 Farewell to Camraw +% Tenor +\version "2.18.2" +tenorA = \drummode { + R1 + r8 g d16 g d g d8 g d16 g d g | + d8 g d16 g d g d4 d16 g d g | + d4 g16 d g d d4 r4 | + d4 d8 g d4 r4 | + d4 d8 g d4 r4 | + d8 g d g d4 d8 g | + d8 g r4 r2 | + +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly new file mode 100755 index 0000000..5bc5872 --- /dev/null +++ b/airs/farewell_to_camraw/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \snareA + >> + } + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly new file mode 100755 index 0000000..bf21971 --- /dev/null +++ b/airs/farewell_to_camraw/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \tenorA + >> + } + \header { + title = "Farewell to Camraw" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan.side.ly deleted file mode 100755 index 4d8a6f6..0000000 --- a/airs/morag_of_dunvegan.side.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 r8 d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - \break - \repeat volta 2 { - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) - } - }% End of drums % - } - \header { - title = "Morag of Dunvegan" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly b/airs/morag_of_dunvegan/bass.ly similarity index 63% rename from airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly rename to airs/morag_of_dunvegan/bass.ly index 2d1d63c..15447aa 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.bass.ly +++ b/airs/morag_of_dunvegan/bass.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.bass.ly" +\include "config.ily" +\include "notes.bass.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\bassA \bassB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Bass" } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily new file mode 100755 index 0000000..5c596f9 --- /dev/null +++ b/airs/morag_of_dunvegan/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly b/airs/morag_of_dunvegan/drums.ly similarity index 78% rename from airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly rename to airs/morag_of_dunvegan/drums.ly index 117f76b..76d2545 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.drums.ly +++ b/airs/morag_of_dunvegan/drums.ly @@ -1,9 +1,9 @@ \version "2.19.0" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.bass.ly" -\include "morag_of_dunvegan.notes.tenor.ly" -\include "morag_of_dunvegan.notes.side.ly" +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" \score { \new StaffGroup << @@ -11,7 +11,7 @@ \set PipeBandDrumStaff.instrumentName = #"Side " \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " - \time 6/8 + \global << { \formatA \formatB } { \snareA \snareB } diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly b/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly deleted file mode 100755 index 85ddf11..0000000 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.format.ly +++ /dev/null @@ -1,4 +0,0 @@ -\version "2.19.0" - -formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } -formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly b/airs/morag_of_dunvegan/notes.bass.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.bass.ly rename to airs/morag_of_dunvegan/notes.bass.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly b/airs/morag_of_dunvegan/notes.side.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.side.ly rename to airs/morag_of_dunvegan/notes.side.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly b/airs/morag_of_dunvegan/notes.tenor.ily similarity index 100% rename from airs/morag_of_dunvegan/morag_of_dunvegan.notes.tenor.ly rename to airs/morag_of_dunvegan/notes.tenor.ily diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly b/airs/morag_of_dunvegan/side.ly similarity index 64% rename from airs/morag_of_dunvegan/morag_of_dunvegan.side.ly rename to airs/morag_of_dunvegan/side.ly index ee55619..013d4f7 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.side.ly +++ b/airs/morag_of_dunvegan/side.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.side.ly" +\include "config.ily" +\include "notes.side.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\snareA \snareB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Side" } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly b/airs/morag_of_dunvegan/tenor.ly similarity index 64% rename from airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly rename to airs/morag_of_dunvegan/tenor.ly index 84cdf99..79f8985 100755 --- a/airs/morag_of_dunvegan/morag_of_dunvegan.tenor.ly +++ b/airs/morag_of_dunvegan/tenor.ly @@ -1,11 +1,11 @@ \version "2.18.2" -\include "morag_of_dunvegan.format.ly" -\include "morag_of_dunvegan.notes.tenor.ly" +\include "config.ily" +\include "notes.tenor.ily" \score { \new PipeBandDrumStaff { - \time 6/8 + \global << {\formatA \formatB} {\tenorA \tenorB} @@ -14,7 +14,6 @@ \header { title = "Morag of Dunvegan" meter = "Slow Air" - composer = "" instrument = "Tenor" } } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily new file mode 100755 index 0000000..8b3fc9d --- /dev/null +++ b/airs/the_mist_covered_mountains/config.ily @@ -0,0 +1,10 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +part = {\partial 8 s8 } +%% Format +formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly new file mode 100755 index 0000000..4ef51dc --- /dev/null +++ b/airs/the_mist_covered_mountains/drums.ly @@ -0,0 +1,39 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + \global + << + {\formatA \formatB } + {\snareA \snareB } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = #"Bass " + % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + % + % \bassA + % \bassB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorB + } + >> + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily new file mode 100755 index 0000000..bd59aa5 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.side.ily @@ -0,0 +1,23 @@ +\version "2.18.2" +snareA = \drummode { + \partial 8 d8:32( | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d8)[ r8 d8:32(] | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d4.) | +} +snareB = \drummode { + \partial 8 d8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + d2.:32( | + d8.)-> g16 d8 g8 r8 g8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + r8 g8 d8 r8 d8 g8 | + d4.:32( d4.) | +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily new file mode 100755 index 0000000..fe1b048 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.tenor.ily @@ -0,0 +1,25 @@ +% 6/8 The Mist Covered Mountains +% Tenor +\version "2.18.2" +tenorA = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8. g16 d8 g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8 g8 d8 g8 r4 +} +tenorB = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + r8. g16 d8 r8. d16 g8 | + d8 g8 d8 g8 r4 +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly new file mode 100755 index 0000000..e9a3db1 --- /dev/null +++ b/airs/the_mist_covered_mountains/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\snareA \snareB} + >> + } + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + instrument = "Side" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly new file mode 100755 index 0000000..c1c8324 --- /dev/null +++ b/airs/the_mist_covered_mountains/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\tenorA \tenorB} + >> + } + \header { + title = "The Mist Covered Mountains" + meter = "Slow Air" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly similarity index 100% rename from airs/the_mist_covered_mountains.side.ly rename to airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly diff --git a/airs/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly similarity index 100% rename from airs/the_mist_covered_mountains.tenor.ly rename to airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly diff --git a/header_default.ily b/header_default.ily index 5359785..6d61f1c 100755 --- a/header_default.ily +++ b/header_default.ily @@ -7,7 +7,6 @@ today = #(strftime "%B %e, %Y" (localtime (current-time))) \paper { - raggedbottom = ##t tagline = \markup { \line { "Cpl ET de Boone, Seaforths of Holland," diff --git a/makedrum b/makedrum index 50e836b..1e58d77 100755 --- a/makedrum +++ b/makedrum @@ -10,7 +10,7 @@ from argparse import ArgumentParser class MakeDrum: LILYPOND = 'lilypond' - VERSION = '0.7' + VERSION = '0.9' TMP_DIR = './tmp' TMP_PREFIX = 'tmp_' MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -154,11 +154,11 @@ class MakeDrum: include_drum_file = False include_pipe_file = False # find out whether drum, pipes, or full score - for ext in ['.full', '.side', '.tenor', '.bass', '.drum', '.snare']: + for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: if ext in file: include_drum_file = True - for ext in ['.full', '.pipes']: + for ext in ['full', 'pipes']: if ext in file: include_pipe_file = True diff --git a/strathspeys/lady_mackenzie_of_fairburn.drums.ly b/strathspeys/lady_mackenzie_of_fairburn.drums.ly deleted file mode 100755 index f04b139..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn.drums.ly +++ /dev/null @@ -1,169 +0,0 @@ -%%%% SNARE DRUM %%%% -snareA = \drummode { - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. g16 - \triplet { d16 g d g d8 } - g8 g8 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8. - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - d8[:32( g8]:32)(-> - d8:32)( g8]:32)(-> - d4:32)(-> - d4) - - } -%%%% BASS DRUM %%%% -bassA = \drummode { - bd4 bd4-> r4 bd4 - | - bd4-> r4 bd4 r4 - | - bd4-> bd4 r4 bd4 - | - bd4 r4 bd4-> bd4 - } -bassBA = \drummode { - s16 | - s1*4 - } -bassBB = \drummode { - s16 | - s1*4 - } -%%%% TENOR DRUM %%%% -tenorA = \drummode { - d8.[ g16] - d4^\splitTheFeather - r4 - << d4 g4 >> - | \flourish{ - d4 - g4 - d4 - g4 - } | - d4 - r16 g d-> r - r8. g16 - d4 - | - d4 - g4 - d4 - r4 - } -tenorBA = \drummode { - s16 | - s1^\bfly s1 - s1*2 - } -tenorBB = \drummode { - s16 | - s1*4 - } - -formatA = { % Part 1 - \repeat volta 2 { - \repeat unfold 4 { s1 | } - } - \break - } -formatBA = { % Part 2.1 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \break - } - -formatBB = { % Part 2.2 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \bar "|." -} - -\score { - \new StaffGroup << - \new PipeBandDrumStaff { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " - << - {\formatA \formatBA \formatBB} - { - \snareA - \snareBA \snareBB - } - >> - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Bass " - \set DrumStaff.shortInstrumentName = #"B.D. " - - \bassA - \bassBA \bassBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Tenor " - \set DrumStaff.shortInstrumentName = #"T.D. " - - \tenorA - \tenorBA \tenorBB - } - >> - \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - composer = "E.T. de Boone" - } -} diff --git a/strathspeys/lady_mackenzie_of_fairburn.full.ly b/strathspeys/lady_mackenzie_of_fairburn.full.ly deleted file mode 100755 index 1db4691..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn.full.ly +++ /dev/null @@ -1,244 +0,0 @@ -pipesA = { - d16 | - \dblc c8. e16 - \dblA A4 - g16 f16 e8 - \dblA A4 - | - \hdblc c8. e16 - \dblA A8. d16 - \dblc c8. b16 - \grg a8. d16 - | - \dblc c8. e16 - \dblA A4 - g16 f e8 - \dblg g4 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg a8. s16 - } -pipesBA = { - d16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble e8. d16 - \dblc c8. b16 - \grg a8. A16 - | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. s16 -} -pipesBB = { - A16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble d8. d16 - \dblc c8. b16 - \grg a8. A16 - | - a8. \grd c16 - \grg e8. A16 - \hdblf g8. d16 - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. s16 - -} -snareA = \drummode { - s16 | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. g16 - \triplet { d16 g d g d8 } - g8 g8 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8. - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8[:32( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8[:32)( g8]:32)(-> - d8.) s16 - } -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8:32( g8:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - d8[:32( g8]:32)(-> - d8:32)( g8]:32)(-> - d4:32)(-> - d4) - - } -bassA = \drummode { - s16 | - bd4 bd4-> r4 bd4 - | - bd4-> r4 bd4 r4 - | - bd4-> bd4 r4 bd4 - | - bd4 r4 bd4-> bd4 - } -bassBA = \drummode { - s16 | - s1*4 - } -bassBB = \drummode { - s16 | - s1*4 - } -tenorA = \drummode { - s16 | - d8.[ g16] - d4^\splitTheFeather - r4 - << d4 g4 >> - | \flourish{ - d4 - g4 - d4 - g4 - } | - d4 - r16 g d-> r - r8. g16 - d4 - | - d4 - g4 - d4 - r4 - } -tenorBA = \drummode { - s16 | - s1*2 - s1*2 - } -tenorBB = \drummode { - s16 | - s1*4 - } -formatA = { % Part 1 - \repeat volta 2 { - \partial 16 s16 | - \repeat unfold 4 { s1 | } - } - \break - } -formatBA = { % Part 2.1 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \break - } - -formatBB = { % Part 2.2 - \partial 16 s16 | - \repeat unfold 4 { s1 | } - \bar "|." -} - -\score { - \new StaffGroup << - \new Staff { - \bagpipeKey - \set Staff.instrumentName = #"Pipes " - \set Staff.shortInstrumentName = #"P. " - - \override KeySignature.stencil = ##f - - << - {\formatA \formatBA \formatBB} - {\pipesA \pipesBA \pipesBB} - >> - } - \new PipeBandDrumStaff { - \set DrumStaff.instrumentName = #"Side " - \set DrumStaff.shortInstrumentName = #"S.D. " - - \snareA - \snareBA \snareBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Bass " - \set DrumStaff.shortInstrumentName = #"B.D. " - - \bassA - \bassBA \bassBB - } - \new DrumStaff { - \set DrumStaff.instrumentName = #"Tenor " - \set DrumStaff.shortInstrumentName = #"T.D. " - - \tenorA - \tenorBA \tenorBB - } - >> - \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - composer = "E.T. de Boone" - } -} diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly new file mode 100755 index 0000000..25189f7 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/bass.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\bassA \bassBA \bassBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily new file mode 100755 index 0000000..2c24775 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily @@ -0,0 +1,9 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = {\partial 16 s16 } +line = { \repeat unfold 4 { s1 | } } diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly new file mode 100755 index 0000000..16d48ed --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/drums.ly @@ -0,0 +1,43 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + << + { \repeat volta 2 {\line } \break \part \line \break \line \bar "|."} + { \snareA s16 \snareBA \snareBB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + \bassA + s16 + \bassBA + \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + s16 + \tenorBA + \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly new file mode 100755 index 0000000..8f9d2e5 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly @@ -0,0 +1,53 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" +\include "notes.pipes.ily" + +\score { + \new StaffGroup << + \new Staff { + \global + \bagpipeKey + \set PipeBandDrumStaff.instrumentName = #"Pipes " + \set PipeBandDrumStaff.shortInstrumentName = #"P." + << + {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side " + \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + + s16 \snareA s16 + \snareBA \snareBB + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + s16 + \bassA + s16 + \bassBA + \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + s16 + \tenorA + s16 + \tenorBA + \tenorBB + } + >> + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily new file mode 100755 index 0000000..017ffb8 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily @@ -0,0 +1,18 @@ +% 4/4 Lady MacKenzie of Fairburn +% Bass +\version "2.18.2" +bassA = \drummode { + bd4 bd4-> r4 bd4 + | + bd4-> r4 bd4 r4 + | + bd4-> bd4 r4 bd4 + | + bd4 r4 bd4-> bd4 +} +bassBA = \drummode { + s1*4 +} +bassBB = \drummode { + s1*4 +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily new file mode 100755 index 0000000..469157a --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -0,0 +1,69 @@ +% 4/4 Lady MacKenzie of Fairburn +% Pipes +\version "2.18.2" +pipesA = { + d16 | + \dblc c8. e16 + \dblA A4 + g16 f16 e8 + \dblA A4 + | + \hdblc c8. e16 + \dblA A8. d16 + \dblc c8. b16 + \grg a8. d16 + | + \dblc c8. e16 + \dblA A4 + g16 f e8 + \dblg g4 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg a8. +} +pipesBA = { + d16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble e8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} +pipesBB = { + A16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble d8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \grg e8. A16 + \hdblf g8. d16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily new file mode 100755 index 0000000..3623901 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -0,0 +1,68 @@ +% 4/4 Lady MacKenzie of Fairburn +% Side +\version "2.18.2" +snareA = \drummode { + \flam d8. g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. g16 + \triplet { d16 g d g d8 } + g8 g8 + | + d8.[:32( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.) +} +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8. + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8.[:32( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.) +} +snareBB = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + {\flam d8.} g16 + d8.:32( g16) + \flam d8 \< \triplet {d16 g d } + \flam g4-> \! + | + d8.[:32( g16]:32)(-> + d8.:32)( g16]:32)(-> + d4:32)(-> + d8.) +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily new file mode 100755 index 0000000..149d21f --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily @@ -0,0 +1,20 @@ +% 4/4 Lady MacKenzie of Fairburn +% Tenor +\version "2.18.2" +tenorA = \drummode { + d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> + | + \flourish { d4 g4 d4 g4 } + | + d4 r16 g d-> r r8. g16 d4 + | + d4 g4 d4 r4 + | +} +tenorBA = \drummode { + s1*2 + s1*2 +} +tenorBB = \drummode { + s1*4 +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly new file mode 100755 index 0000000..b08c1c2 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" + +\score { + \new Staff { + \global + \bagpipeKey + << + {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Pipes" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly new file mode 100755 index 0000000..e5d3d4d --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \break \line \bar "|."} + {\snareA s16 \snareBA \snareBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Side" + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly new file mode 100755 index 0000000..f302af2 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\tenorA \tenorBA \tenorBB} + >> + } + \header { + title = "Lady MacKenzie of Fairburn" + meter = "Strathspey" + instrument = "Tenor" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly deleted file mode 100755 index 51e0d0f..0000000 --- a/strathspeys/molly_connell.bass.ly +++ /dev/null @@ -1,30 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_bass"{ - \set Staff.instrumentName = #"Bass" - \set Staff.shortInstrumentName = #"B.D." - - \time 4/4 - - \drummode { - \repeat volta 2 { - d4-> g4-> d4 g4 | - d4 g4 d4 g4 | - d4-> g4 d4 g4 | - d4-> g4 d8.-> g16 d4 | - - \break - d4-> g4-> d4 g4 | - r8 d8 r8 g8 r8 d8 r8 g8 | - d4-> g4 d4 g4 | - d4-> g4 r8. g16 d4 | - - } - } - } - \header { - title = "Molly Connell" - composer = "W.H. de Boone / E.T. de Boone, 2014" - instrument = "Bass Drum" - meter = "STRATHSPEY" - } -} diff --git a/strathspeys/molly_connell.side.ly b/strathspeys/molly_connell.side.ly deleted file mode 100755 index 7b20bb3..0000000 --- a/strathspeys/molly_connell.side.ly +++ /dev/null @@ -1,42 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - \partial 8 r8 - \flamd d4 \flamg g8.[ d16:64(] d8.[) \dragg g16] d8.[ g16] | - d8.:64[( g16]) \tuplet 3/2 { d16[ g d g d8]} \tuplet 3/2 { g8[ d8 \flamg g8] } \flamd d8.[ g16] | - - d16:64[( d8.]) g8.[ \dragd d16] \tuplet 3/2 { d16[ g d g d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 - } - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - - \tuplet 3/2 { \flamd d8[ g16 g16 d8] } g8.[ g16] \tuplet 3/2 { d8[ g16 g16 d8] } g8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - \break - \partial 8 g8 | - d4:32( d8.[) \dragd d16] \tuplet 3/2 { d16[ g d g d g8] } g8.[ g16] | - \dragd d16[ d8.] \flamd d8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } \tuplet 3/2 { g8[ d g] } | - - \flamd d4 \flamg g8.[ d16:64]( d8.[) \dragg g16] d8.[ g16] | - \tuplet 3/2 { \flamd d8[ g d] } \flamg g8.[ \flamg g16] \tuplet 3/2 { d16[ g d g d8] } g8 | - - \bar "|." - }% End of drums % - } - \header { - title = "Molly Connell" - meter = "Strathspey" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell.tenor.ly b/strathspeys/molly_connell.tenor.ly deleted file mode 100755 index bf68e89..0000000 --- a/strathspeys/molly_connell.tenor.ly +++ /dev/null @@ -1,37 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - d4 g4 d8. g16 d4 - d4 g4 r8. g16 d4 - \flourish { d4 d4 g4 g4 } - \flourish d4 \flourish g4 d4^\up g4^\up - } - \break - d4^\up g4^\up \flourish { d4 g4 } - d4 \parenthesize d8. g16 r8. g16 d4 - \flourish { d4 d4 g4 g4 } - \flourish d4 \flourish g4 d4^\up g4^\up - - \break - d4^\up g4^\up \flourish { d4 g4 } - d4 \parenthesize d8. g16 r8. g16 d4 - d4 g4 d8. g16 d4 - \flourish d4 \flourish g4 d4^\up g4^\up - \bar "|." - - }% End of drums % - } - \header { - title = "Molly Connell" - meter = "Strathspey" - composer = "B. de Boone/ M. Jansen/ N. Kuijkhoven/ E.T. de Boone, 2014" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly new file mode 100755 index 0000000..179bf08 --- /dev/null +++ b/strathspeys/molly_connell/bass.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \repeat volta 2 { \line \break \line \break } + {\bassAA \bassAB} + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Bass" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily new file mode 100755 index 0000000..cdd114c --- /dev/null +++ b/strathspeys/molly_connell/config.ily @@ -0,0 +1,8 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } +%% Format +part = {\partial 8 s8 } +line = { \repeat unfold 4 { s1 } } diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly new file mode 100755 index 0000000..e0873ea --- /dev/null +++ b/strathspeys/molly_connell/drums.ly @@ -0,0 +1,66 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = #"Side" + \set PipeBandDrumStaff.shortInstrumentName = #"S.D." + + \global + << + { + \line \break + \line \break + \bar "|." + + \part \line \break + \part \line \break + \bar "|." + }%End of Format + { + \set Score.proportionalNotationDuration = #(ly:make-moment 1/8) + \snareA + s8 + \snareA + s8 + + \snareBA + \snareBB + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = #"Bass " + \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + + \bassAA + \bassAB + + s8 + \bassAA + s8 + \bassAB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = #"Tenor" + \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + + \tenorA + \tenorA + + s8 + \tenorBA + s8 + \tenorBB + } + >> + \header { + title = "Molly Connell" + meter = "Slow Air" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily new file mode 100755 index 0000000..d489740 --- /dev/null +++ b/strathspeys/molly_connell/notes.bass.ily @@ -0,0 +1,15 @@ +% 4/4 Molly Connell +% Bass +\version "2.18.2" +bassAA = \drummode { + d4-> g4-> d4 g4 | + d4 g4 d4 g4 | + d4-> g4 d4 g4 | + d4-> g4 d8.-> g16 d4 | + } +bassAB = \drummode { + d4-> g4-> d4 g4 | + r8 d8 r8 g8 r8 d8 r8 g8 | + d4-> g4 d4 g4 | + d4-> g4 r8. g16 d4 | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily new file mode 100755 index 0000000..d4a538d --- /dev/null +++ b/strathspeys/molly_connell/notes.side.ily @@ -0,0 +1,27 @@ +% 4/4 Molly Connell +% Side +\version "2.18.2" +snareA = \drummode { + \flam d4 \flam g8.[ d16:64(] d8.[) \drag d16] d8.[ g16] | + d8.:64[( g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] | + + d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 +} + +snareBA = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flamd \triplet { d8[ g16 g16 d8] } g8.[ g16] \triplet { d8[ g16 g16 d8] } g8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} +snareBB = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flam d4 \flam g8.[ d16:64]( d8.[) \drag g16] d8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily new file mode 100755 index 0000000..4bf45cf --- /dev/null +++ b/strathspeys/molly_connell/notes.tenor.ily @@ -0,0 +1,21 @@ +% 4/4 Molly Connell +% Tenor +\version "2.18.2" +tenorA = \drummode { + d4 g4 d8. g16 d4 + d4 g4 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBA = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBB = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + d4 g4 d8. g16 d4 | + \flourish d4 \flourish g4 d4^\up g4^\up | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly new file mode 100755 index 0000000..44fe070 --- /dev/null +++ b/strathspeys/molly_connell/side.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \break \part \line \bar "|." } + {\snareA s8 \snareBA \snareBB } + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Side" + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly new file mode 100755 index 0000000..c09bfb2 --- /dev/null +++ b/strathspeys/molly_connell/tenor.ly @@ -0,0 +1,19 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 {\line} \break \line \break \line \bar "|." } + {\tenorA \tenorBA \tenorBB } + >> + } + \header { + title = "Molly Connell" + meter = "Strathspey" + instrument = "Tenor" + } +} \ No newline at end of file From e90fa3d5c2b8b2e354c6d00686a9fea1c641a56d Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Mon, 9 Nov 2015 06:06:58 +0100 Subject: [PATCH 25/33] Updated TODO, up2date with last commit --- todo | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/todo b/todo index ffa8f8b..406409a 100755 --- a/todo +++ b/todo @@ -1,30 +1,15 @@ TODO - * show 8th and 16th beats in beaming, currently only 8ths + * show 8th and 16th beats in beaming, currently only 8ths: d32[[ g] d[ g]] d32[[ g] d[ g]] * Macro for tutti's (unisons) * Macro for "Part 2 of $n" * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming) - * A tuplet beginning with a flam has a strange tuplet beam (slanted) + * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. ) * It's customary to have 4 bars per line for portrait and 8 for landscape... - * TEMPLATING - Find a nice filing system for easy saving, editing, generation of the scores - *** script to easily generate the scores - should be able to generate single instrument scores aswell as full drumscores (side, tenor, bass), - and possibly fullscores (with the pipetune) - from referenced files - *** templates - - * SIDE sticking (lookup swiss notation) - regular default - cross-stick cross + * SIDE sticking rimshot default + cross - backstick white triangle pointing down - * FLOURISHING short long note above-note - regular flourish \fl \flourish cross ups \up arrow-up scoop \scoop arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one] - split the feather \stf \splitTheFeather xcircle - cartwheel \cart \cartwheel circle with dot (further EUSPBA symbols) \ No newline at end of file From 87c2ef5fd81a91fdcfb673eaee8290b5dad877dc Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 18 Nov 2015 02:42:10 +0100 Subject: [PATCH 26/33] Changed setup of all scores, now possible to extend easily --- 2-4_marches/black_bear.side.ly | 53 ------ 2-4_marches/black_bear.v1.2.side.ly | 56 ------- 2-4_marches/black_bear.v1.3.side.ly | 73 --------- 2-4_marches/black_bear/config.ily | 14 ++ 2-4_marches/black_bear/notes.side.ily | 31 ++++ 2-4_marches/black_bear/notes.side.v1.2.ily | 33 ++++ 2-4_marches/black_bear/notes.side.v1.3.ily | 33 ++++ 2-4_marches/black_bear/side.ly | 27 +++ 2-4_marches/duncan_mcinness.side.ly | 100 ----------- 2-4_marches/duncan_mcinness/config.ily | 15 ++ 2-4_marches/duncan_mcinness/notes.side.ily | 83 ++++++++++ 2-4_marches/duncan_mcinness/side.ly | 32 ++++ .../mackenzie_highlanders.alternate.side.ly | 63 ------- 2-4_marches/mackenzie_highlanders.side.ly | 47 ------ 2-4_marches/mackenzie_highlanders/config.ily | 21 +++ .../mackenzie_highlanders/notes.side.alt.ily | 48 ++++++ .../mackenzie_highlanders/notes.side.ily | 36 ++++ 2-4_marches/mackenzie_highlanders/side.alt.ly | 28 ++++ 2-4_marches/mackenzie_highlanders/side.ly | 26 +++ 3-4_marches/castle_dangerous/config.ily | 20 +++ 3-4_marches/castle_dangerous/notes.tenor.ily | 24 +++ 3-4_marches/castle_dangerous/tenor.ly | 24 +++ .../on_the_road_to_passchendaele.side.ly | 45 ----- .../on_the_road_to_passchendaele/config.ily | 20 +++ .../notes.side.ily | 35 ++++ .../on_the_road_to_passchendaele/side.ly | 33 ++++ 4-4_marches/51st_highland_division.side.ly | 55 ------- 4-4_marches/51st_highland_division/config.ily | 19 +++ .../51st_highland_division/notes.side.ily | 29 ++++ 4-4_marches/51st_highland_division/side.ly | 35 ++++ 4-4_marches/flett_from_flotta.side.ly | 43 ----- 4-4_marches/flett_from_flotta/config.ily | 21 +++ 4-4_marches/flett_from_flotta/notes.side.ily | 29 ++++ 4-4_marches/flett_from_flotta/side.ly | 28 ++++ 4-4_marches/minstrel_boy.side.ly | 54 ------ 4-4_marches/minstrel_boy/config.ily | 20 +++ 4-4_marches/minstrel_boy/notes.side.ily | 33 ++++ 4-4_marches/minstrel_boy/side.ly | 33 ++++ 4-4_marches/rowan_tree.side.ly | 41 ----- 4-4_marches/rowan_tree/config.ily | 21 +++ 4-4_marches/rowan_tree/notes.side.ily | 23 +++ 4-4_marches/rowan_tree/side.ly | 27 +++ 4-4_marches/scotland_the_brave.side.ly | 36 ---- 4-4_marches/scotland_the_brave/config.ily | 21 +++ 4-4_marches/scotland_the_brave/notes.side.ily | 21 +++ 4-4_marches/scotland_the_brave/side.ly | 27 +++ 4-4_marches/the_leaving_of_liverpool.side.ly | 48 ------ .../the_leaving_of_liverpool/config.ily | 15 ++ 4-4_marches/the_leaving_of_liverpool/drums.ly | 63 +++++++ .../the_leaving_of_liverpool/notes.side.ily | 33 ++++ .../the_leaving_of_liverpool/notes.tenor.ily | 27 +++ 4-4_marches/the_leaving_of_liverpool/side.ly | 30 ++++ 4-4_marches/the_leaving_of_liverpool/tenor.ly | 20 +++ 4-4_marches/the_old_rustic_bridge.tenor.ly | 31 ---- 4-4_marches/the_old_rustic_bridge/config.ily | 21 +++ .../the_old_rustic_bridge/notes.tenor.ily | 13 ++ 4-4_marches/the_old_rustic_bridge/tenor.ly | 20 +++ 4-4_marches/the_pikemans_march.side.ly | 49 ------ 4-4_marches/the_pikemans_march.v1.5.side.ly | 52 ------ 4-4_marches/the_pikemans_march/config.ily | 19 +++ 4-4_marches/the_pikemans_march/drums.ly | 67 ++++++++ 4-4_marches/the_pikemans_march/notes.side.ily | 39 +++++ .../the_pikemans_march/notes.side.v1.5.ily | 39 +++++ .../the_pikemans_march/notes.side.v1.6.ily | 39 +++++ .../the_pikemans_march/notes.tenor.ily | 33 ++++ 4-4_marches/the_pikemans_march/side.ly | 32 ++++ 4-4_marches/the_pikemans_march/tenor.ly | 31 ++++ 4-4_marches/were_no_awa_tae_bide_awa.side.ly | 28 ---- .../were_no_awa_tae_bide_awa/config.ily | 15 ++ .../were_no_awa_tae_bide_awa/notes.side.ily | 19 +++ 4-4_marches/were_no_awa_tae_bide_awa/side.ly | 26 +++ 4-4_marches/wings.side.ly | 52 ------ 4-4_marches/wings/config.ily | 14 ++ 4-4_marches/wings/notes.side.ily | 28 ++++ 4-4_marches/wings/side.ly | 39 +++++ 5-4_marches/cullen_bay.bass.ly | 19 --- 5-4_marches/cullen_bay.tenor.ly | 28 ---- 5-4_marches/cullen_bay/bass.ly | 20 +++ 5-4_marches/cullen_bay/config.ily | 13 ++ 5-4_marches/cullen_bay/drums.ly | 65 ++++++++ 5-4_marches/cullen_bay/notes.bass.ily | 7 + 5-4_marches/cullen_bay/notes.side.ily | 62 +++++++ 5-4_marches/cullen_bay/notes.tenor.ily | 16 ++ 5-4_marches/cullen_bay/side.ly | 30 ++++ 5-4_marches/cullen_bay/tenor.ly | 20 +++ 6-8_marches/hills_of_glenorchy.snare.ly | 52 ------ 6-8_marches/hills_of_glenorchy/config.ily | 14 ++ 6-8_marches/hills_of_glenorchy/notes.side.ily | 33 ++++ 6-8_marches/hills_of_glenorchy/side.ly | 26 +++ airs/abide_with_me.side.ly | 32 ---- airs/abide_with_me/config.ily | 14 ++ airs/abide_with_me/notes.side.ily | 16 ++ airs/abide_with_me/side.ly | 31 ++++ airs/alexander_mackenzie.side.ly | 65 -------- airs/alexander_mackenzie/config.ily | 14 ++ airs/alexander_mackenzie/notes.side.ily | 28 ++++ airs/alexander_mackenzie/side.ly | 29 ++++ airs/amazing_grace.side.ly | 48 ------ airs/amazing_grace/config.ily | 14 ++ airs/amazing_grace/notes.side.ily | 31 ++++ airs/amazing_grace/side.ly | 34 ++++ airs/farewell_to_camraw/config.ily | 6 +- airs/farewell_to_camraw/drums.ly | 38 +++-- airs/farewell_to_camraw/notes.side.ily | 1 + airs/farewell_to_camraw/notes.tenor.ily | 1 + airs/farewell_to_camraw/side.ly | 7 +- airs/farewell_to_camraw/tenor.ly | 7 +- airs/flower_of_scotland.side.ly | 38 ----- airs/flower_of_scotland/config.ily | 14 ++ airs/flower_of_scotland/notes.side.ily | 26 +++ airs/flower_of_scotland/side.ly | 24 +++ airs/loch_duich.side.ly | 64 -------- airs/loch_duich/config.ily | 14 ++ airs/loch_duich/notes.side.ily | 46 ++++++ airs/loch_duich/side.ly | 33 ++++ airs/miss_kirkwood.side.ly | 41 ----- airs/miss_kirkwood/config.ily | 14 ++ airs/miss_kirkwood/notes.side.ily | 25 +++ airs/miss_kirkwood/side.ly | 26 +++ airs/morag_of_dunvegan/bass.ly | 7 +- airs/morag_of_dunvegan/config.ily | 11 +- airs/morag_of_dunvegan/drums.ly | 28 +++- airs/morag_of_dunvegan/side.ly | 7 +- airs/morag_of_dunvegan/tenor.ly | 7 +- airs/my_home.side.ly | 40 ----- airs/my_home/config.ily | 14 ++ airs/my_home/drums.ly | 54 ++++++ airs/my_home/notes.side.ily | 26 +++ airs/my_home/notes.tenor.ily | 15 ++ airs/my_home/side.ly | 26 +++ airs/my_home/tenor.ly | 26 +++ airs/the_mist_covered_mountains/config.ily | 11 +- airs/the_mist_covered_mountains/drums.ly | 38 +++-- airs/the_mist_covered_mountains/side.ly | 7 +- airs/the_mist_covered_mountains/tenor.ly | 7 +- .../the_mist_covered_mountains.side.ly | 41 ----- .../the_mist_covered_mountains.tenor.ly | 37 ----- hornpipes/itchy_fingers.side.ly | 62 ------- hornpipes/itchy_fingers/config.ily | 15 ++ hornpipes/itchy_fingers/notes.side.ily | 35 ++++ hornpipes/itchy_fingers/side.ly | 27 +++ jigs/seaforth_sticks.side.ly | 155 ------------------ jigs/seaforth_sticks/config.ily | 14 ++ jigs/seaforth_sticks/drums.ly | 65 ++++++++ jigs/seaforth_sticks/notes.bass.ily | 6 + jigs/seaforth_sticks/notes.side.ily | 123 ++++++++++++++ jigs/seaforth_sticks/notes.tenor.ily | 6 + jigs/seaforth_sticks/side.ly | 38 +++++ jigs/seaforth_sticks/tenor.ly | 29 ++++ strathspeys/aa_camerons.snare.ly | 51 ------ strathspeys/aa_camerons/config.ily | 14 ++ strathspeys/aa_camerons/notes.side.ily | 30 ++++ strathspeys/aa_camerons/side.ly | 39 +++++ .../lady_mackenzie_of_fairburn/bass.ly | 7 +- .../lady_mackenzie_of_fairburn/config.ily | 6 +- .../lady_mackenzie_of_fairburn/drums.ly | 38 +++-- .../lady_mackenzie_of_fairburn/full.ly | 57 ++++--- .../lady_mackenzie_of_fairburn/notes.bass.ily | 11 +- .../notes.pipes.ily | 1 + .../lady_mackenzie_of_fairburn/notes.side.ily | 113 ++++++------- .../notes.tenor.ily | 42 ++++- .../lady_mackenzie_of_fairburn/pipes.ly | 7 +- .../lady_mackenzie_of_fairburn/side.ly | 9 +- .../lady_mackenzie_of_fairburn/tenor.ly | 7 +- strathspeys/molly_connell/bass.ly | 7 +- strathspeys/molly_connell/config.ily | 7 +- strathspeys/molly_connell/drums.ly | 30 +++- strathspeys/molly_connell/notes.bass.ily | 1 + strathspeys/molly_connell/notes.side.ily | 1 + strathspeys/molly_connell/notes.side.v1.1.ily | 28 ++++ strathspeys/molly_connell/notes.tenor.ily | 1 + strathspeys/molly_connell/side.ly | 11 +- strathspeys/molly_connell/tenor.ly | 9 +- template/config.ily | 14 ++ template/drums.ly | 47 ++++++ template/full.ly | 55 +++++++ template/notes.bass.ily | 6 + template/notes.pipes.ily | 6 + template/notes.side.ily | 6 + template/notes.tenor.ily | 6 + template/pipes.ly | 21 +++ template/side.ly | 20 +++ template/tenor.ly | 20 +++ 183 files changed, 3577 insertions(+), 1892 deletions(-) delete mode 100755 2-4_marches/black_bear.side.ly delete mode 100755 2-4_marches/black_bear.v1.2.side.ly delete mode 100755 2-4_marches/black_bear.v1.3.side.ly create mode 100755 2-4_marches/black_bear/config.ily create mode 100755 2-4_marches/black_bear/notes.side.ily create mode 100755 2-4_marches/black_bear/notes.side.v1.2.ily create mode 100755 2-4_marches/black_bear/notes.side.v1.3.ily create mode 100755 2-4_marches/black_bear/side.ly delete mode 100755 2-4_marches/duncan_mcinness.side.ly create mode 100755 2-4_marches/duncan_mcinness/config.ily create mode 100755 2-4_marches/duncan_mcinness/notes.side.ily create mode 100755 2-4_marches/duncan_mcinness/side.ly delete mode 100755 2-4_marches/mackenzie_highlanders.alternate.side.ly delete mode 100755 2-4_marches/mackenzie_highlanders.side.ly create mode 100755 2-4_marches/mackenzie_highlanders/config.ily create mode 100755 2-4_marches/mackenzie_highlanders/notes.side.alt.ily create mode 100755 2-4_marches/mackenzie_highlanders/notes.side.ily create mode 100755 2-4_marches/mackenzie_highlanders/side.alt.ly create mode 100755 2-4_marches/mackenzie_highlanders/side.ly create mode 100755 3-4_marches/castle_dangerous/config.ily create mode 100755 3-4_marches/castle_dangerous/notes.tenor.ily create mode 100755 3-4_marches/castle_dangerous/tenor.ly delete mode 100755 3-4_marches/on_the_road_to_passchendaele.side.ly create mode 100755 3-4_marches/on_the_road_to_passchendaele/config.ily create mode 100755 3-4_marches/on_the_road_to_passchendaele/notes.side.ily create mode 100755 3-4_marches/on_the_road_to_passchendaele/side.ly delete mode 100755 4-4_marches/51st_highland_division.side.ly create mode 100755 4-4_marches/51st_highland_division/config.ily create mode 100755 4-4_marches/51st_highland_division/notes.side.ily create mode 100755 4-4_marches/51st_highland_division/side.ly delete mode 100755 4-4_marches/flett_from_flotta.side.ly create mode 100755 4-4_marches/flett_from_flotta/config.ily create mode 100755 4-4_marches/flett_from_flotta/notes.side.ily create mode 100755 4-4_marches/flett_from_flotta/side.ly delete mode 100755 4-4_marches/minstrel_boy.side.ly create mode 100755 4-4_marches/minstrel_boy/config.ily create mode 100755 4-4_marches/minstrel_boy/notes.side.ily create mode 100755 4-4_marches/minstrel_boy/side.ly delete mode 100755 4-4_marches/rowan_tree.side.ly create mode 100755 4-4_marches/rowan_tree/config.ily create mode 100755 4-4_marches/rowan_tree/notes.side.ily create mode 100755 4-4_marches/rowan_tree/side.ly delete mode 100755 4-4_marches/scotland_the_brave.side.ly create mode 100755 4-4_marches/scotland_the_brave/config.ily create mode 100755 4-4_marches/scotland_the_brave/notes.side.ily create mode 100755 4-4_marches/scotland_the_brave/side.ly delete mode 100755 4-4_marches/the_leaving_of_liverpool.side.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/config.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/drums.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/notes.side.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/notes.tenor.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/side.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/tenor.ly delete mode 100755 4-4_marches/the_old_rustic_bridge.tenor.ly create mode 100755 4-4_marches/the_old_rustic_bridge/config.ily create mode 100755 4-4_marches/the_old_rustic_bridge/notes.tenor.ily create mode 100755 4-4_marches/the_old_rustic_bridge/tenor.ly delete mode 100755 4-4_marches/the_pikemans_march.side.ly delete mode 100755 4-4_marches/the_pikemans_march.v1.5.side.ly create mode 100755 4-4_marches/the_pikemans_march/config.ily create mode 100755 4-4_marches/the_pikemans_march/drums.ly create mode 100755 4-4_marches/the_pikemans_march/notes.side.ily create mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.5.ily create mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.6.ily create mode 100755 4-4_marches/the_pikemans_march/notes.tenor.ily create mode 100755 4-4_marches/the_pikemans_march/side.ly create mode 100755 4-4_marches/the_pikemans_march/tenor.ly delete mode 100755 4-4_marches/were_no_awa_tae_bide_awa.side.ly create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/config.ily create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/side.ly delete mode 100755 4-4_marches/wings.side.ly create mode 100755 4-4_marches/wings/config.ily create mode 100755 4-4_marches/wings/notes.side.ily create mode 100755 4-4_marches/wings/side.ly delete mode 100755 5-4_marches/cullen_bay.bass.ly delete mode 100755 5-4_marches/cullen_bay.tenor.ly create mode 100755 5-4_marches/cullen_bay/bass.ly create mode 100755 5-4_marches/cullen_bay/config.ily create mode 100755 5-4_marches/cullen_bay/drums.ly create mode 100755 5-4_marches/cullen_bay/notes.bass.ily create mode 100755 5-4_marches/cullen_bay/notes.side.ily create mode 100755 5-4_marches/cullen_bay/notes.tenor.ily create mode 100755 5-4_marches/cullen_bay/side.ly create mode 100755 5-4_marches/cullen_bay/tenor.ly delete mode 100755 6-8_marches/hills_of_glenorchy.snare.ly create mode 100755 6-8_marches/hills_of_glenorchy/config.ily create mode 100755 6-8_marches/hills_of_glenorchy/notes.side.ily create mode 100755 6-8_marches/hills_of_glenorchy/side.ly delete mode 100755 airs/abide_with_me.side.ly create mode 100755 airs/abide_with_me/config.ily create mode 100755 airs/abide_with_me/notes.side.ily create mode 100755 airs/abide_with_me/side.ly delete mode 100755 airs/alexander_mackenzie.side.ly create mode 100755 airs/alexander_mackenzie/config.ily create mode 100755 airs/alexander_mackenzie/notes.side.ily create mode 100755 airs/alexander_mackenzie/side.ly delete mode 100755 airs/amazing_grace.side.ly create mode 100755 airs/amazing_grace/config.ily create mode 100755 airs/amazing_grace/notes.side.ily create mode 100755 airs/amazing_grace/side.ly delete mode 100755 airs/flower_of_scotland.side.ly create mode 100755 airs/flower_of_scotland/config.ily create mode 100755 airs/flower_of_scotland/notes.side.ily create mode 100755 airs/flower_of_scotland/side.ly delete mode 100755 airs/loch_duich.side.ly create mode 100755 airs/loch_duich/config.ily create mode 100755 airs/loch_duich/notes.side.ily create mode 100755 airs/loch_duich/side.ly delete mode 100755 airs/miss_kirkwood.side.ly create mode 100755 airs/miss_kirkwood/config.ily create mode 100755 airs/miss_kirkwood/notes.side.ily create mode 100755 airs/miss_kirkwood/side.ly delete mode 100755 airs/my_home.side.ly create mode 100755 airs/my_home/config.ily create mode 100755 airs/my_home/drums.ly create mode 100755 airs/my_home/notes.side.ily create mode 100755 airs/my_home/notes.tenor.ily create mode 100755 airs/my_home/side.ly create mode 100755 airs/my_home/tenor.ly delete mode 100755 airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly delete mode 100755 airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly delete mode 100755 hornpipes/itchy_fingers.side.ly create mode 100755 hornpipes/itchy_fingers/config.ily create mode 100755 hornpipes/itchy_fingers/notes.side.ily create mode 100755 hornpipes/itchy_fingers/side.ly delete mode 100755 jigs/seaforth_sticks.side.ly create mode 100755 jigs/seaforth_sticks/config.ily create mode 100755 jigs/seaforth_sticks/drums.ly create mode 100755 jigs/seaforth_sticks/notes.bass.ily create mode 100755 jigs/seaforth_sticks/notes.side.ily create mode 100755 jigs/seaforth_sticks/notes.tenor.ily create mode 100755 jigs/seaforth_sticks/side.ly create mode 100755 jigs/seaforth_sticks/tenor.ly delete mode 100755 strathspeys/aa_camerons.snare.ly create mode 100755 strathspeys/aa_camerons/config.ily create mode 100755 strathspeys/aa_camerons/notes.side.ily create mode 100755 strathspeys/aa_camerons/side.ly create mode 100755 strathspeys/molly_connell/notes.side.v1.1.ily create mode 100755 template/config.ily create mode 100755 template/drums.ly create mode 100755 template/full.ly create mode 100755 template/notes.bass.ily create mode 100755 template/notes.pipes.ily create mode 100755 template/notes.side.ily create mode 100755 template/notes.tenor.ily create mode 100755 template/pipes.ly create mode 100755 template/side.ly create mode 100755 template/tenor.ly diff --git a/2-4_marches/black_bear.side.ly b/2-4_marches/black_bear.side.ly deleted file mode 100755 index 0c1ccc3..0000000 --- a/2-4_marches/black_bear.side.ly +++ /dev/null @@ -1,53 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 2/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d32 g32 d32 g32 d4 | - r4^\markup {\bold HOI} d8:32( g8:32)(-> | - - \break - - d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d4 d4:32( | - d8) \flamg g8 \flamd d8 - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - d8 - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - - \break - - d4:32( d8.:32)( g16:32)( | - d8:32)( g8:32)( d4)( | - g8:32)( d8:32)( g16.) d32-> g16. g32 | - \flamd d8 d8:32( g8) \bar "|." - - }% End of drums % - } - - \header { - title = "Black Bear" - meter = "March" - composer = "E.T. de Boone, 2015" - instrument = "Side" - } -} \ No newline at end of file diff --git a/2-4_marches/black_bear.v1.2.side.ly b/2-4_marches/black_bear.v1.2.side.ly deleted file mode 100755 index 95d94e8..0000000 --- a/2-4_marches/black_bear.v1.2.side.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 2/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | - r4^\markup {\bold YELL} d8:32( g8:32)(-> | - - \break - - d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d4 d4:32( | - d8) \flam g8 \flam d8 - - } - - \break - - g8 - % Part 2 ( Part 2.2 = Part 1) - \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | - \flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | - \tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | - \flam d8:32( g16.)(-> g32) d32 g16. d16. g32 | - - \break - - \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | - g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | - \bar "|." - - }% End of drums % - } - \header { - title = "Black Bear" - meter = "March" - composer = "version 1.2, 2015" - instrument = "Side" - } -} \ No newline at end of file diff --git a/2-4_marches/black_bear.v1.3.side.ly b/2-4_marches/black_bear.v1.3.side.ly deleted file mode 100755 index 132b3b6..0000000 --- a/2-4_marches/black_bear.v1.3.side.ly +++ /dev/null @@ -1,73 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -yell = \markup { \bold \small HOY } - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - - \time 2/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16.-> \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 | - \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | - r4^\yell d8:32( \< g8:32)(-> | - - \break - - d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d4 d4:32( | - d8) \flam g8 \flam d8 - - } - - \break - - g8 - % Part 2 ( Part 2.2 = Part 1) - \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | - d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | - \tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | - d8:32( g16.)(-> g32) d32 g16. d16. g32 | - - \break - - \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | - g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | - \bar "||" - \break - - d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | - r4^\yell d8:32( \< g8:32)(-> | - - \break - - d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d4 d4:32( | - d8) \flam g8 \flam d8 r8 - - }% End of drums % - } - \header { - title = "Black Bear" - meter = "March" - composer = "version 1.3, 2015" - instrument = "Side" - } -} diff --git a/2-4_marches/black_bear/config.ily b/2-4_marches/black_bear/config.ily new file mode 100755 index 0000000..514c3ac --- /dev/null +++ b/2-4_marches/black_bear/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Black Bear" +meter = "March" \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily new file mode 100755 index 0000000..2a4e129 --- /dev/null +++ b/2-4_marches/black_bear/notes.side.ily @@ -0,0 +1,31 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 +} +% Part 2 +snareBA = \drummode { + g8 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) +} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.2.ily b/2-4_marches/black_bear/notes.side.v1.2.ily new file mode 100755 index 0000000..ff4ce2e --- /dev/null +++ b/2-4_marches/black_bear/notes.side.v1.2.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, v1.2, 2015" + +%%music +yell = \markup { \bold HOI} + +snareA = \drummode { + d8:32( | + g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( g8:32)(-> | + + d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 +} +% Part 2 +snareBA = \drummode { + g8 | + \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | +} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.3.ily b/2-4_marches/black_bear/notes.side.v1.3.ily new file mode 100755 index 0000000..8386890 --- /dev/null +++ b/2-4_marches/black_bear/notes.side.v1.3.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSide = "E.T. de Boone, v1.3, 2015" + +%%music +yell = \markup { \bold HOI} + +snareA = \drummode { + d8:32( | + g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16.-> \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( \< g8:32)(-> | + + d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 +} +% Part 2 +snareBA = \drummode { + g8 + \flamd \tuplet 3/2 { d16 g16 d16->} g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \flamd \tuplet 3/2 { d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \flamd \tuplet 3/2 { d32 d32 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \flamg \tuplet 3/2 { g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | +} \ No newline at end of file diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly new file mode 100755 index 0000000..63f7b68 --- /dev/null +++ b/2-4_marches/black_bear/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.v1.3.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \halfline \break \halfline } \break + \part \line \bar "|." + } + { + \snareA s8 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness.side.ly b/2-4_marches/duncan_mcinness.side.ly deleted file mode 100755 index 1b6c293..0000000 --- a/2-4_marches/duncan_mcinness.side.ly +++ /dev/null @@ -1,100 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 2/4 - - \drummode { - \repeat volta 2{ - \partial 8 d8:32( | - g8) d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 r16. g32 | - \flamd d8 d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8:32( g8) | - - \flamd d8. d16 \flamg g16 r16 g16 \flamd d16 | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8. g16 | - - \flamd d8 d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2 { - \partial 8 d16. g32 | - d8:32( g8:32)( d8.) d16:64( | - d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - } - \alternative { - { - d8:32( g8:32)( d8.) d16:64( | - d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) - \break - } - << - { - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g4) - \bar "|." - } - \new PipeBandDrumStaff{ - \once \omit Staff.TimeSignature - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g16.) d32:128( d16.) g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | - \flamd d8 d8:32( g4) - } - >> - } - }% End of drums % - } - \header { - title = "Duncan McInness" - meter = "Drum Salute in Quick Time" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/config.ily b/2-4_marches/duncan_mcinness/config.ily new file mode 100755 index 0000000..d691081 --- /dev/null +++ b/2-4_marches/duncan_mcinness/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Duncan McInnes" +meter = "Drum Salute in Quick Time" \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/notes.side.ily b/2-4_marches/duncan_mcinness/notes.side.ily new file mode 100755 index 0000000..da43ca6 --- /dev/null +++ b/2-4_marches/duncan_mcinness/notes.side.ily @@ -0,0 +1,83 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + d8:32( | + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 2 +snareB = \drummode { + r16. g32 | + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8:32( g8) | + + \flamd d8. d16 \flamg g16 r16 g16 \flamd d16 | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8. g16 | + + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 3 +snareC = \drummode { + d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 4 +snareDA = \drummode { + d16. g32 | + d8:32( g8:32)(-> d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | +} +snareDAB = \drummode { + d8:32( g8:32)(-> d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +snareDAC = \drummode { + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + << + { + g8) \flamd d8 d16 \flamg g8 g16 | + } + \new PipeBandDrumStaff{ + \eighthBeaming + \once \omit Staff.TimeSignature + g16. d32:128( d16.) g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | + } + >> + + \flamd d8 d8:32( g4) + \bar "|." +} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly new file mode 100755 index 0000000..eb5a099 --- /dev/null +++ b/2-4_marches/duncan_mcinness/side.ly @@ -0,0 +1,32 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } \break + \part \halfline \halfline \bar "||" \break + \part \halfline \halfline \bar "|." + } + { + \snareA s8 + \snareB s8 + \snareC s8 + \snareDA \snareDAB s8 + \snareDA \snareDAC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders.alternate.side.ly b/2-4_marches/mackenzie_highlanders.alternate.side.ly deleted file mode 100755 index fcb0893..0000000 --- a/2-4_marches/mackenzie_highlanders.alternate.side.ly +++ /dev/null @@ -1,63 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_side" { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 2/4 - \eighthBeaming - - \drummode { - \repeat volta 2{ - \partial 8 d8:32( | - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - d8:64(-> g32) d g d g8 d8:32( | - - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) - } - \break - - \partial 8 g8 | - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - d8:64(-> g32) d g d g8 g8-> | - - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) g8 - - \bar "||" - \break - - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - \flam d4 d8:32(-> \< g8:32)(-> | - - d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } - d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d4) - \bar ":|" - } - - } - \header { - title = "MacKenzie Highlanders" - composer = "alternate version, 2015" - meter = "March" - } -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly deleted file mode 100755 index 49be3ec..0000000 --- a/2-4_marches/mackenzie_highlanders.side.ly +++ /dev/null @@ -1,47 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 2/4 - \eighthBeaming - - \drummode { - \repeat volta 2{ - \partial 8 d8:32( | - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - - \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | - d4:32( d8) d8:32( | - - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - - - \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | - d4:32( d8) - } - \break - \repeat volta 2{ - \partial 8 g8 | - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 | - d4:32( d8) g8 | - - d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | - - \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | - d4:32( d8) - } - } - - } - \header { - title = "MacKenzie Highlanders" - meter = "March" - } -} diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily new file mode 100755 index 0000000..e06e3f9 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "MacKenzie Highlanders" +meter = "Trooping of the Colours" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily new file mode 100755 index 0000000..75ff26a --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily @@ -0,0 +1,48 @@ +% 2/4 MacKenzie Highlanders +% Snare +\version "2.18.2" +composerSide = "alternate version" + +%%music +snareA = \drummode { + d8:32( | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d8) +} +% Part 2 +snareBA = \drummode { + g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 g8-> | + + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d8) g8 +} +snareBB = \drummode { + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + \flam d4 d8:32(-> \< g8:32)(-> | + + d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } + d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d4) +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily new file mode 100755 index 0000000..e96556f --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.side.ily @@ -0,0 +1,36 @@ +% 2/4 MacKenzie Highlanders +% Snare +\version "2.18.2" +composerSnare = "" + +%%music +snareA = \drummode { + d8:32( | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | + d4:32( d8) d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | + d4:32( d8) +} +% Part 2 +snareB = \drummode { + g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 | + d4:32( d8) g8 | + + d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | + d4:32( d8) +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly new file mode 100755 index 0000000..c1d5d78 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/side.alt.ly @@ -0,0 +1,28 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.alt.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \part \line \bar "||" \break + \line \bar "|." + } + { + \snareA s8 + \snareBA + \snareBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly new file mode 100755 index 0000000..049f71b --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } + } + { + \snareA s8 + \snareB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/config.ily b/3-4_marches/castle_dangerous/config.ily new file mode 100755 index 0000000..f62ad90 --- /dev/null +++ b/3-4_marches/castle_dangerous/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Castle Dangerous" +meter = "March" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/notes.tenor.ily b/3-4_marches/castle_dangerous/notes.tenor.ily new file mode 100755 index 0000000..2cb9a1e --- /dev/null +++ b/3-4_marches/castle_dangerous/notes.tenor.ily @@ -0,0 +1,24 @@ +% 3/4 Castle Dangerous +% Tenor +\version "2.18.2" +composerTenor = "" + +%%music +tenorA = \drummode { + r8. d16 + g4 + r8 d8 + | + r8 g8 + r8 d8 + r8 g8 + | + r8 d8 + r8 g8 + r8 d8 + | + r8 g8 + r8 d16 g + d16 g d g + | +} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/tenor.ly b/3-4_marches/castle_dangerous/tenor.ly new file mode 100755 index 0000000..87e0cd6 --- /dev/null +++ b/3-4_marches/castle_dangerous/tenor.ly @@ -0,0 +1,24 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line } + } + { + \tenorA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele.side.ly b/3-4_marches/on_the_road_to_passchendaele.side.ly deleted file mode 100755 index b20daf1..0000000 --- a/3-4_marches/on_the_road_to_passchendaele.side.ly +++ /dev/null @@ -1,45 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 3/4 - - \drummode { - \repeat volta 2{ - \flamd d8. g16 d4:32( d8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | - - d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | - \break - \flamd d8.^"2 of 2" g16 d4:32( d8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | - - \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | - d16. d32 \flamg g8 d4:32( d4) - } - \break - \repeat volta 2{ - d16[ \dragg g8 g16] d8:32( g8) d4:32( | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d4 d4:32( | - - d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | - \break - d8.^"1 of 2" g16 d8:32( g8) d4:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | - - \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | - d16. d32 \flamg g8 d4:32( d4) - } - }% End of drums % - } - \header { - title = "On the Road to Passchendaele" - meter = "Retreat" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/config.ily b/3-4_marches/on_the_road_to_passchendaele/config.ily new file mode 100755 index 0000000..1eab0ad --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "On the Road to Passchendaele" +meter = "Retreat" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily new file mode 100755 index 0000000..2dc6ba8 --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily @@ -0,0 +1,35 @@ +% 3/4 On the Road to Passchendaele +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + \flamd d8. g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | +} +snareAB = \drummode { + \flamd d8. g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + d16[ \dragg g8 g16] d8:32( g8) d4:32( | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | +} +snareBB = \drummode { + d8. g16 d8:32( g8) d4:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) +} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/side.ly b/3-4_marches/on_the_road_to_passchendaele/side.ly new file mode 100755 index 0000000..6c6e7dc --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line } \break + \line \bar "||" \break + \line \bar "|." + } + { + \snareAA + \snareAB + + \snareBA + \snareBB + + \snareBA + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division.side.ly b/4-4_marches/51st_highland_division.side.ly deleted file mode 100755 index 49491ea..0000000 --- a/4-4_marches/51st_highland_division.side.ly +++ /dev/null @@ -1,55 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - \partial 8 d16. g32 | - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | - - - } - \alternative { - { - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - \flamg g4 d4:32( d4) r8 - } - { - d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | - \flamg g4 d4:32( d4) r8 - } - } - - \break - d16. g32 | - d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | - - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - - \set Timing.measureLength = #(ly:make-moment 7/8) - \flamg g4 d4:32( d4) r8 - - \break - \set Timing.measureLength = #(ly:make-moment 1/8) - d16. g32 | - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | - - d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | - \flamg g4 d4:32( d4) r8 - }% End of drums % - } - \header { - title = "51st Highland Division" - meter = "March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily new file mode 100755 index 0000000..62bd8fc --- /dev/null +++ b/4-4_marches/51st_highland_division/config.ily @@ -0,0 +1,19 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "51st Highland Division" +meter = "March" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily new file mode 100755 index 0000000..96649e7 --- /dev/null +++ b/4-4_marches/51st_highland_division/notes.side.ily @@ -0,0 +1,29 @@ +% 4/4 51st Highland Division +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | +} +snareAA = \drummode { + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + \flamg g4 d4:32( d4) r8 +} +snareAB = \drummode { + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 +} +% Part 2 +snareB = \drummode { + d16. g32 | + d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + + \flamg g4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly new file mode 100755 index 0000000..2133e85 --- /dev/null +++ b/4-4_marches/51st_highland_division/side.ly @@ -0,0 +1,35 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { + \repeat volta 2 { \part \halfline \break} + \alternative { {\halfline} {\halfline } } + \bar "|." \break + \part \line \bar "||" \break + \line \bar "|." + } + } + { + \snareA + \snareAA s8 + \snareAB s8 + + \snareB + \snareA \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta.side.ly b/4-4_marches/flett_from_flotta.side.ly deleted file mode 100755 index 1baec6c..0000000 --- a/4-4_marches/flett_from_flotta.side.ly +++ /dev/null @@ -1,43 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \drummode { - \repeat volta 2{ - \partial 8 d8:32( | - g8.) g16 d8:32( g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32)( | - d4) d8:32(-> \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32 \flamd d8 d8:32( | - d4)-> d4:32( d4) d4:32( | - \break - g8.) g16 d8:32( g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | - \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | - d4)-> d4:32( d4) r8 - } - \break - \repeat volta 2{ - \partial 8 r8| - d4:32( d8) d32 g d g d32 g d g d8 \flamg g8 d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 d4:32( g8:32)(-> d8:32)(-> | - d4) r4 r4 r4 | - d8.:32(-> g16) d8:32(-> g8)-> d32 g d g d16. g32-> r16 g16-> r16 g16-> | - \break - g8.:32(-> g16) d8:32(-> g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | - \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | - d4)-> d4:32( d4) r8 - } - - }% End of drums % - } - \header { - title = "Flett from Flotta" - meter = "March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/config.ily b/4-4_marches/flett_from_flotta/config.ily new file mode 100755 index 0000000..0a1c04c --- /dev/null +++ b/4-4_marches/flett_from_flotta/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Flett from Flotta" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/notes.side.ily b/4-4_marches/flett_from_flotta/notes.side.ily new file mode 100755 index 0000000..ee07480 --- /dev/null +++ b/4-4_marches/flett_from_flotta/notes.side.ily @@ -0,0 +1,29 @@ +% 4/4 Flett from Flotta +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d8:32( | + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32)( | + d4) d8:32(-> \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32 \flamd d8 d8:32( | + d4)-> d4:32( d4) d4:32( | + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 +} +% Part 2 +snareB = \drummode { + d4:32( d8) d32 g d g d32 g d g d8 \flamg g8 d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 d4:32( g8:32)(-> d8:32)(-> | + d4) r4 r4 r4 | + d8.:32(-> g16) d8:32(-> g8)-> d32 g d g d16. g32-> r16 g16-> r16 g16-> | + + g8.:32(-> g16) d8:32(-> g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/side.ly b/4-4_marches/flett_from_flotta/side.ly new file mode 100755 index 0000000..33c6635 --- /dev/null +++ b/4-4_marches/flett_from_flotta/side.ly @@ -0,0 +1,28 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break \line } + \repeat volta 2 { \line \break \line } + + } + { + \snareA s8 + + \snareB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy.side.ly b/4-4_marches/minstrel_boy.side.ly deleted file mode 100755 index 84d8004..0000000 --- a/4-4_marches/minstrel_boy.side.ly +++ /dev/null @@ -1,54 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \drummode { - \repeat volta 2{ - \partial 4 - - \dragd d16. d32-> g16. g32 | - - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - \break - d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) - } - - \break - - % Part 2 - \partial 4 - \flamd d8. d16:32( | - g16) g16 d8:32( g16) g16 d8:32( g8:32)( d8) r8 d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) - - \break - - \dragd d16. d32-> g16. g32 | - - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - d8:32)(-> g8:32)-> r8 d8:32( g8) \dragd d16. d32-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) - - } - } - -} - -\header { - title = "Minstrel Boy" - meter = "March" -} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily new file mode 100755 index 0000000..0670598 --- /dev/null +++ b/4-4_marches/minstrel_boy/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Minstrel Boy" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/notes.side.ily b/4-4_marches/minstrel_boy/notes.side.ily new file mode 100755 index 0000000..0c3d098 --- /dev/null +++ b/4-4_marches/minstrel_boy/notes.side.ily @@ -0,0 +1,33 @@ +% 4/4 Minstrel Boy +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + \break + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} +snareAB = \drummode { + \dragd d16. d32-> g16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + \break + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + \flamd d8. d16:32( | + g16) g16 d8:32( g16) g16 d8:32( g8:32)( d8) r8 d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly new file mode 100755 index 0000000..c1d3c30 --- /dev/null +++ b/4-4_marches/minstrel_boy/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \part \line \break + \line \break \bar "|." + + \partial 4 s4 | + \line \break + \line \break \bar "|." + } + { + \snareAA + \snareAB s4 + + \snareBA + \snareAB r8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree.side.ly b/4-4_marches/rowan_tree.side.ly deleted file mode 100755 index 03a4d62..0000000 --- a/4-4_marches/rowan_tree.side.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 4 - r8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - } - \break - % Part 2 ( Part 2.2 = Part 1) - d8. g16 | - d8:32(-> g8:32)(-> g8:32)( d8:32)(-> g8:32)( d8:32)(-> g8)-> d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - - r8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \flamd d8 d8:32( g8) d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) - }% End of drums % - } - \header { - title = "Rowan Tree" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/config.ily b/4-4_marches/rowan_tree/config.ily new file mode 100755 index 0000000..618eb0f --- /dev/null +++ b/4-4_marches/rowan_tree/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Rowan Tree" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily new file mode 100755 index 0000000..3a89957 --- /dev/null +++ b/4-4_marches/rowan_tree/notes.side.ily @@ -0,0 +1,23 @@ +% 4/4 Rowan Tree +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareEnding = \drummode { + \flamd d8[ d8]:32( g8[) d8]:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) +} +snareA = \drummode { + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \snareEnding +} +% Part 2 +snareBA = \drummode { + d8. g16 | + d8[:32(-> g8]:32)(-> g8[:32)( d8]:32)(-> g8[:32)( d8]:32)(-> g8[)-> d8]:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | + \snareEnding +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly new file mode 100755 index 0000000..552d64c --- /dev/null +++ b/4-4_marches/rowan_tree/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break } + \part \line \bar "||" + } + { + \snareA s4 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave.side.ly b/4-4_marches/scotland_the_brave.side.ly deleted file mode 100755 index f5d0fe0..0000000 --- a/4-4_marches/scotland_the_brave.side.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | - \flamd d4 d4:32( d4) r8 - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - g8 | - d4:32( d8) g8 d4:32( d8) g8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d4 d4:32( d4) r8 - }% End of drums % - } - \header { - title = "Scotland the Brave" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily new file mode 100755 index 0000000..211da0d --- /dev/null +++ b/4-4_marches/scotland_the_brave/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Scotland the Brave" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily new file mode 100755 index 0000000..6877598 --- /dev/null +++ b/4-4_marches/scotland_the_brave/notes.side.ily @@ -0,0 +1,21 @@ +% 4/4 Scotland the Brave +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | + \flamd d4 d4:32( d4) r8 +} +% Part 2 +snareBA = \drummode { + g8 | + d4:32( d8) g8 d4:32( d8) g8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly new file mode 100755 index 0000000..5a8db2e --- /dev/null +++ b/4-4_marches/scotland_the_brave/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\part \line \break } + \part \line \bar "||" + } + { + \snareA s8 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool.side.ly b/4-4_marches/the_leaving_of_liverpool.side.ly deleted file mode 100755 index 4e5698e..0000000 --- a/4-4_marches/the_leaving_of_liverpool.side.ly +++ /dev/null @@ -1,48 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \eighthBeaming - - \drummode { - \repeat volta 2{ - \partial 4 r8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | - - \flamd d4 d4:32( d4) - } - \break - \partial 4 \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | - - \flamd d4 d4:32( d4) r8 - - \partial 4 \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | - - d4 d4:32( d4) r8 - - }% End of drums % - } - \header { - title = "The Leaving of Liverpool" - meter = "March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily new file mode 100755 index 0000000..da97336 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "The Leaving of Liverpool" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly new file mode 100755 index 0000000..6e27158 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/drums.ly @@ -0,0 +1,63 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat volta 2 { \part \line } \break + \part \line \break + \line \bar "|." + } + { + \snareA s4 + + \snareBA + \snareBB + } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + % + % \bassA + % s16 \bassBA \bassBB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + r8 r16 \tenorA s4 + r8 r16 \tenorA + r8 r16 \tenorA + s4 + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.side.ily b/4-4_marches/the_leaving_of_liverpool/notes.side.ily new file mode 100755 index 0000000..468df71 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/notes.side.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + r8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + \flamd d4 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) +} +snareBB = \drummode{ + \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | + + d4 d4:32( d4) +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily new file mode 100755 index 0000000..a220de9 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily @@ -0,0 +1,27 @@ +% 4/4 The Leaving of Liverpool +% Tenor +\version "2.18.2" +composerTenor = "F.J. de Boone,2011" + +%%music +tenorA = \drummode { + g16 | + d8[ g] + d[ g] + d[ g] + d[ g] + | + d4 + r8. g16 + d4 + r8. g16 + | + d8[ g] + d[ g] + d[ g] + d[ g] + | + d16 g d g + d g d g + d4 +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly new file mode 100755 index 0000000..b9c7f73 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/side.ly @@ -0,0 +1,30 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \part \line \break + \line \bar "|." + + } + { + \snareA s4 + + \snareBA + \snareBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly new file mode 100755 index 0000000..df92d86 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \partial 16 s16 \line }} + {\tenorA d4 r8.} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge.tenor.ly b/4-4_marches/the_old_rustic_bridge.tenor.ly deleted file mode 100755 index a85557f..0000000 --- a/4-4_marches/the_old_rustic_bridge.tenor.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \drummode { - \time 4/4 - \eighthBeaming - - \repeat volta 2 { - \partial 16 g16 | - d4 g8 d g4 d8. g16 | - d8 g d4 g r | - d4 g8 d g d g d | - g4 r4 d4 r4 | - - d4 g8 d g4 d8. g16 | - d8 g d4 g r | - d4 g8 d g d g d | - g4 r4 d4 r4 - } - } - } - - \header { - title = "The Old Rustic Bridge" - meter = "March" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily new file mode 100755 index 0000000..a797132 --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "The Old Rustic Bridge" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/notes.tenor.ily b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily new file mode 100755 index 0000000..d6d261b --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily @@ -0,0 +1,13 @@ +% 4/4 The Olde Rustic Bridge +% Tenor +\version "2.18.2" +composerTenor = "" + +%%music +tenorA = \drummode { + g16 | + d4 g8 d g4 d8. g16 | + d8 g d4 g r | + d4 g8[ d] g[ d] g[ d] | + g4 r4 d4 r4 | +} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly new file mode 100755 index 0000000..284c092 --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat unfold 2 {\repeat volta 2 { \part \line } \break }} + {\repeat unfold 2 {s16\tenorA}} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march.side.ly b/4-4_marches/the_pikemans_march.side.ly deleted file mode 100755 index 43a8130..0000000 --- a/4-4_marches/the_pikemans_march.side.ly +++ /dev/null @@ -1,49 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \eighthBeaming - - \drummode { - \repeat volta 2 { - \partial 8 g8 | - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | - \flamd d4 d4:32( d4) r8 g8 | - \break - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | - \flamd d4 d4:32( d4) r8 - } - \break - \partial 8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | - - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | - - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 - }% End of drums % - } - \header { - title = "The Pikeman's March" - meter = "March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march.v1.5.side.ly b/4-4_marches/the_pikemans_march.v1.5.side.ly deleted file mode 100755 index c7557b4..0000000 --- a/4-4_marches/the_pikemans_march.v1.5.side.ly +++ /dev/null @@ -1,52 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \eighthBeaming - - \drummode { - \repeat volta 2 { - \partial 8 g16. g32 | - \flamd d4-^ d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | - \flamd d8.. g32 \tuplet 3/2 { d16 d g} \flam d16. g32 \tuplet 3/2 { d16 d g } \flam d16. g32 \flam d16. d32 \tuplet 3/2 { g16 g d } - \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | - \break - \flamd d4-^ d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | - \flam d8. g16 d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> d8.)-> \parenthesize d16:64( \parenthesize d8:64) - } - \break - \partial 8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | - - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | - - \break - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 - }% End of drummode % - } - \header { - title = "The Pikeman's March" - meter = "March" - composer = "version 1.5, 2015" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily new file mode 100755 index 0000000..1907399 --- /dev/null +++ b/4-4_marches/the_pikemans_march/config.ily @@ -0,0 +1,19 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +line = { \repeat unfold 4 { s1 | } } + +%% Headers +title = "The Pikeman's March" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly new file mode 100755 index 0000000..de9beec --- /dev/null +++ b/4-4_marches/the_pikemans_march/drums.ly @@ -0,0 +1,67 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.v1.6.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { \repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { \snareAA + \snareAB + s8 + + \snareBA + \snareBB + \snareBC + } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + % + % \bassA + % s16 \bassBA \bassBB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorAA + \tenorAB + s8 + + \tenorBA + \tenorBB + \tenorBC + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily new file mode 100755 index 0000000..23e4242 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, 2014" + +%%music +snareAA = \drummode { + g8 | + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d4:32( d4) r8 g8 | +} +snareAB = \drummode { + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) r8 +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.5.ily b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily new file mode 100755 index 0000000..4671802 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, v1.5, 2015" + +%%music +snareAA = \drummode { + g16. g32 | + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | + \flamd d8.. g32 \tuplet 3/2 { d16 d g} \flam d16. g32 \tuplet 3/2 { d16 d g } \flam d16. g32 \flam d16. d32 \tuplet 3/2 { g16 g d } + \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | +} +snareAB = \drummode { + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | + \flam d8. g16 d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> d8.)-> \parenthesize d16:64( \parenthesize d8:64) +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.6.ily b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily new file mode 100755 index 0000000..eafdf43 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, v1.6, 2015" + +%%music +snareAA = \drummode { + g16. g32 | + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | +} +snareAB = \drummode { + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | + \flam d8. g16 d8:32(-> g8:32)(-> d8.)-> d16:64( d8:64) +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily new file mode 100755 index 0000000..5473491 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.tenor.ily @@ -0,0 +1,33 @@ +% 4/4 The Pikeman's March +% Tenor +\version "2.18.2" +composerTenor = "E.T. de Boone, 2015" + +%%music +tenorAA = \drummode { + d16 \< g16 | + d4 \! g8. d16 r8 d16 g d4 + | + d8 g d8 g d4 g4 + | + d4-> r16 d16 r8 r16 g16 r8 r16 d r g + | + d4 d8^\markup{scoop} g d4^\markup{end} r8 +} +tenorAB = \drummode { + d16 \< g16 | + d4 \! g8. d16 r8 d16 g d4 + | + d8 g d8 g d4 g4 + | + d8 g r8 g8 d8 g8 r4 + | + d4 d8^\markup{scoop} g d4^\markup{end} r8 +} +% Part 2 +tenorBA = \drummode { +} +tenorBB = \drummode { +} +tenorBC = \drummode { +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly new file mode 100755 index 0000000..995938f --- /dev/null +++ b/4-4_marches/the_pikemans_march/side.ly @@ -0,0 +1,32 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.v1.5.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { + \snareAA + \snareAB + s8 + + \snareBA + \snareBB + \snareBC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly new file mode 100755 index 0000000..9be85a5 --- /dev/null +++ b/4-4_marches/the_pikemans_march/tenor.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { + \tenorAA + \tenorAB + + \tenorBA + \tenorBB + \tenorBC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa.side.ly b/4-4_marches/were_no_awa_tae_bide_awa.side.ly deleted file mode 100755 index 0019ddb..0000000 --- a/4-4_marches/were_no_awa_tae_bide_awa.side.ly +++ /dev/null @@ -1,28 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \eighthBeaming - - \drummode { - \repeat volta 2 { - \partial 8 d16. g32 | - d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | - \tuplet 3/2 { g16) d g } \flam d16. g32 \tuplet 3/2 { d16 g d } \flam g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flam d8 r8 | - d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | - g4) d4:32( d4) r8 g8 | - \break - d2:32(\< d4)\! r8 g8 | - d8:32( g8) g8 d8:32( d8) r8 r8 g8 | - \flam d8 g16. d32-> g16. g32 \flam d16. g32 \flam d16. d32:128( d16) g16-> d16 g d \flam d | - d4 d4:32( d4) r8 - } - } - } - \header { - title = "We're No' Awa Tae Bide Awa" - meter = "March" - } -} \ No newline at end of file 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 new file mode 100755 index 0000000..7f4c476 --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "We're No' Awa Tae Bide Awa" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily new file mode 100755 index 0000000..db5105c --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily @@ -0,0 +1,19 @@ +% 4/4 We're No Awa Tae Bide Awa +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + d16. g32 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + \tuplet 3/2 { g16) d g } \flam d16. g32 \tuplet 3/2 { d16 g d } \flam g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flam d8 r8 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + g4) d4:32( d4) r8 g8 | +} +snareAB = \drummode { + d2:32(\< d4)\! r8 g8 | + d8[:32( g8]) g8[ d8]:32( d8[) r8 r8 g8 | + \flam d8 g16. d32-> g16. g32 \flam d16. g32 \flam d16. d32:128( d16) g16-> d16 g d \flam d | + d4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/side.ly b/4-4_marches/were_no_awa_tae_bide_awa/side.ly new file mode 100755 index 0000000..484c510 --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\part \line \break \line \break} + } + { + \snareAA + + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/wings.side.ly b/4-4_marches/wings.side.ly deleted file mode 100755 index f537fe2..0000000 --- a/4-4_marches/wings.side.ly +++ /dev/null @@ -1,52 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - \eighthBeaming - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 - d8:32)(^"Part 2 of 2" | - g8.) \parenthesize d16 d8:32( g8) r8 d32-> \dr g d g d-> g d g d8-> \fr | - \flamd d8 g16. d32-> g16. g32 \flamd d8 d4:32( d8) d16. g32 | - } - \alternative { - { - \break - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32( d8) \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | - \set Timing.measureLength = #(ly:make-moment 8/8) - \tuplet 3/2 { g16) d g } \flamd d8 d16. g32 \dragd d8 d32 g d g d8 d4:32( - } - { - \break - \set Timing.measureLength = #(ly:make-moment 4/4) - d4:32)( d8) \flamg g8 d32 g d g d8 d16. g32 \dragd d8 | - \set Timing.measureLength = #(ly:make-moment 7/8) - d32 g d g d8 d4:32( d4) r8 - } - } - \bar "|." - \break - % Part 2 ( Part 2.2 = Part 1) - \set Timing.measureLength = #(ly:make-moment 1/8) - d8:32( | - \set Timing.measureLength = #(ly:make-moment 4/4) - g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> g8:32)(-> | - d8.)-> g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | - \break - \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 g d } \flamg g8 | - \flamd d4 r4 d8:32(-> g8:32)(-> d8:32)(-> g8:32)(-> \bar "|." - }% End of drums % - } - \header { - title = "Wings" - meter = "Quick March" - instrument = "Side" - } -} \ No newline at end of file diff --git a/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily new file mode 100755 index 0000000..b2554d2 --- /dev/null +++ b/4-4_marches/wings/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +line = { \repeat unfold 2 { s1 | } } + +%% Headers +title = "Wings" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily new file mode 100755 index 0000000..9bae983 --- /dev/null +++ b/4-4_marches/wings/notes.side.ily @@ -0,0 +1,28 @@ +% 4/4 Wings +% Snare +\version "2.18.2" +composerSide = "K. Westerkamp, 2003" + +%%music +snareAA = \drummode { + d8:32( \mf | + g8.) \parenthesize d16 d8:32( g8) r8 d32-> \< g d g d-> g d g d8-> \! | + \flamd d8 \f g16. d32-> g16. g32 \flamd d8 d4:32( \< d8) \! d16. g32 | +} +snareABA = \drummode { + d4:32( \< d8) \! \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d16.[ g32 \dragd d8] d32 g d g d8 d4:32( +} +snareABB = \drummode { + d4:32)( \< d8) \! \flamg g8 d32 g d g d8 d16.[ g32 \dragd d8] | + d32 g d g d8 d4:32( d4) r8 +} +% Part 2 +snareBA = \drummode { + d8:32( | + g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> \< g8:32)(-> | + d8.)-> \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | + + \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 \p g d } \flamg g8 | + \flamd d4 r4 d8[:32(-> \< g8]:32)(-> d8[:32)(-> g8]:32)(-> | s256) \! +} \ No newline at end of file diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly new file mode 100755 index 0000000..025f155 --- /dev/null +++ b/4-4_marches/wings/side.ly @@ -0,0 +1,39 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \partial 8 s8 + \repeat volta 2 { + s1 | s1 + } + \alternative { + { s1 | s1 } + { s1 | s2^"Fine" s4 s8 \bar "|."} + } + \partial 8 s8 + s1 + s1 + s1 + s1^"D.C. al Fine" \bar "||" + } + { + \snareAA + \snareABA + \snareABB + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay.bass.ly b/5-4_marches/cullen_bay.bass.ly deleted file mode 100755 index 33c2362..0000000 --- a/5-4_marches/cullen_bay.bass.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 5/4 - \drummode { - \repeat volta 2 { - \repeat unfold 8 { d4-^ g d-> g d | } - } - } - } - \header { - title = "Cullen Bay" - meter = "March" - instrument = "Bass" - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay.tenor.ly b/5-4_marches/cullen_bay.tenor.ly deleted file mode 100755 index 1742579..0000000 --- a/5-4_marches/cullen_bay.tenor.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 5/4 - - \drummode { - \repeat volta 4 { - d8-> g d g d-> g d4 d4 | - d8. g16 d8-> g8-> r8 g8 d4 d4 | - d8-> g d g d-> g d8.-> g16-> r8 d8-> | - d4 d4 d8 g8 d4 d4 | - - d4 g4 d4 g4 d4 | - d8. g16 d8-> g8-> r8 g8 d4 d4 | - d4 g4 d8-> g8 d8.-> g16-> r8 d8-> - d4 d4 d8 g8 d4 d4 | - } - } - } - \header { - title = "Cullen Bay" - meter = "March" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly new file mode 100755 index 0000000..c6a3c6b --- /dev/null +++ b/5-4_marches/cullen_bay/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 { \line } } + { \bassA } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/config.ily b/5-4_marches/cullen_bay/config.ily new file mode 100755 index 0000000..c493eea --- /dev/null +++ b/5-4_marches/cullen_bay/config.ily @@ -0,0 +1,13 @@ +\version "2.19.0" +%% Globals +global = { + \time 5/4 + \eighthBeaming + } +%% Format +part = {\partial 8 s8 } +line = { \repeat unfold 4 { s2 s2. } } + +%% Headers +title = "Cullen Bay" +meter = "March" \ No newline at end of file diff --git a/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly new file mode 100755 index 0000000..6371e96 --- /dev/null +++ b/5-4_marches/cullen_bay/drums.ly @@ -0,0 +1,65 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + { + \repeat unfold 4 { + \line + \break + \line + \bar "|." + } + }%End of Format + { + \repeat unfold 2 { \snareA } + \repeat unfold 2 { \snareB } + \repeat unfold 2 { \snareC } + \repeat unfold 2 { \snareD } + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \repeat unfold 4 { + \bassA + } + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat unfold 4 { + \tenorAA \tenorAB + } + } + >> + \header { + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.bass.ily b/5-4_marches/cullen_bay/notes.bass.ily new file mode 100755 index 0000000..515347c --- /dev/null +++ b/5-4_marches/cullen_bay/notes.bass.ily @@ -0,0 +1,7 @@ +% 5/4 Cullen Bay +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { + \repeat unfold 4 { d4-^ g d-> g d | } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily new file mode 100755 index 0000000..128fa28 --- /dev/null +++ b/5-4_marches/cullen_bay/notes.side.ily @@ -0,0 +1,62 @@ +% 5/4 Cullen Bay +% Side +\version "2.18.2" +composerSide = "" +snareEnd = \drummode { + d8[:32)(-> g16.) g32]-> + d8[:32(-> g8]:32)(-> + d8[:32)( g8]:32)(-> + d4) + d4:32( + | + d8) d8:32( + \triplet { g16)[ d g } \flam d8] + g16. d32-> g16. g32 + \flam d8 d16. g32 -> + d16. d32 \flam g8 + | + \flam d8. d16:64( + d8) d8:32( + \triplet { g16) d g } \flam d8 + d4:32( + d4) +} +snareA = \drummode { + \flam d8.[ g16] + d8[:32( g8]) + \flam d8[ d8]:32( + \triplet { g16[) d g } \flam d16. g32] + \triplet { g16[ d g } \flam g8] + | + \snareEnd +} + +snareB = \drummode{ + \flamd d8[ d16 \flam g16] + r16 g16[ \flam d g]\v + r16 d16[ \flam g8] + \flam d4 + d4:32( + | + \snareEnd +} + +snareC = \drummode{ + \flam d8-> \flam d16-> g-> + d16 d \flam g8 + g8 d8:32( + \triplet { g16) d g } \flam d16. g32 + \triplet { g16 d g } \flam g8 + | + \snareEnd +} + +snareD = \drummode{ + \flam d16. g32 d16. g32-> + d32 g d g d16. g32 + d16. g32-> d32 g d g + d4 + d4:32( + | + \snareEnd +} diff --git a/5-4_marches/cullen_bay/notes.tenor.ily b/5-4_marches/cullen_bay/notes.tenor.ily new file mode 100755 index 0000000..2a38922 --- /dev/null +++ b/5-4_marches/cullen_bay/notes.tenor.ily @@ -0,0 +1,16 @@ +% 5/4 Cullen Bay +% Tenor +\version "2.18.2" +composerTenor = "" +tenorAA = \drummode { + d8-> g d g d-> g d4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d8-> g d g d-> g d8.-> g16-> r8 d8-> | + d4 d4 d8 g8 d4 d4 | +} +tenorAB = \drummode { + d4 g4 d4 g4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d4 g4 d8-> g8 d8.-> g16-> r8 d8-> + d4 d4 d8 g8 d4 d4 | +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/side.ly b/5-4_marches/cullen_bay/side.ly new file mode 100755 index 0000000..0b7d3b5 --- /dev/null +++ b/5-4_marches/cullen_bay/side.ly @@ -0,0 +1,30 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + } + { + \snareA + \snareB + \snareC + \snareD + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly new file mode 100755 index 0000000..4b1a939 --- /dev/null +++ b/5-4_marches/cullen_bay/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat unfold 1 { \line \line \bar "|."} } + { \tenorAA \tenorAB } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy.snare.ly b/6-8_marches/hills_of_glenorchy.snare.ly deleted file mode 100755 index a71f821..0000000 --- a/6-8_marches/hills_of_glenorchy.snare.ly +++ /dev/null @@ -1,52 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d8 | - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | - d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | - d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | - - \break - - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - \repeat volta 2 { - \tuplet 5/2 { d16 g d g d } | - g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | - g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 - - \break - - \flamg g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) - } - }% End of drums % - } - \header { - title = "Hills of Glenorchy" - meter = "March" - composer = "G. Clark, 1977" - instrument = "Side" - } -} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/config.ily b/6-8_marches/hills_of_glenorchy/config.ily new file mode 100755 index 0000000..b017bef --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Hills of Glenorchy" +meter = "March" \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/notes.side.ily b/6-8_marches/hills_of_glenorchy/notes.side.ily new file mode 100755 index 0000000..2d185ac --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/notes.side.ily @@ -0,0 +1,33 @@ +% 6/8 Hills of Glenorchy +% Snare +\version "2.18.2" +composerSnare = "G. Clark, 1977" + +%%music +snareA = \drummode { + d8 | + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | + d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | + d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | + + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) +} +% Part 2 +snareBA = \drummode { + \tuplet 5/2 { d16 g d g d } | + g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | + g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 + + \break + + \flamg g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) +} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/side.ly b/6-8_marches/hills_of_glenorchy/side.ly new file mode 100755 index 0000000..b7e19df --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \halfline \break \halfline } + \repeat volta 2 { \part \halfline \break \halfline } + } + { + \snareA s8 + \snareBA s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/abide_with_me.side.ly b/airs/abide_with_me.side.ly deleted file mode 100755 index 319ab92..0000000 --- a/airs/abide_with_me.side.ly +++ /dev/null @@ -1,32 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 4/4 - \eighthBeaming - - \drummode { - \repeat unfold 3{ - \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | - \flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | - \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8 \flam g-> | - d4:32( \< d4:32)( d4:32)( d4:32)( \! \> | - - \break - } - \break - \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 \flam g | - \flam d8->\< \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8[ \drag g]->\! | - d4:32( \> d4:32)( d4:32)( d4:32)( | - d4:32)( \< d4:32)( d4:32)( d4:32) \! - - } - - } - \header { - title = "Abide with Me" - meter = "Hymn" - composer = "nth time through: n drums play score, others: rolls" - } -} diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily new file mode 100755 index 0000000..9e59ebe --- /dev/null +++ b/airs/abide_with_me/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Abide with Me" +meter = "Hymn" \ No newline at end of file diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily new file mode 100755 index 0000000..b299079 --- /dev/null +++ b/airs/abide_with_me/notes.side.ily @@ -0,0 +1,16 @@ +% 4/4 Abide with Me +% Side +\version "2.18.2" +composerSide = "W.H. de Boone, 2014" +snareAA = \drummode { + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8 \flam g-> | + d4:32( \< d4:32)( d4:32)( d4:32)( \! \> | +} +snareAB = \drummode { + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 \flam g | + \flam d8->\< \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8[ \drag g]->\! | + d4:32( \> d4:32)( d4:32)( d4:32)( | + d4:32)( \< d4:32)( d4:32)( d4:32) \! +} \ No newline at end of file diff --git a/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly new file mode 100755 index 0000000..882b282 --- /dev/null +++ b/airs/abide_with_me/side.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\halfline \break} + \alternative { + { \halfline \break } + { \halfline \bar "|."} + } + + } + { + \snareAA + \snareAA + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/alexander_mackenzie.side.ly b/airs/alexander_mackenzie.side.ly deleted file mode 100755 index f70da68..0000000 --- a/airs/alexander_mackenzie.side.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - % Part 1 - \repeat volta 2 { - \partial 8 d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | - - \break - - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - - } - - \break - - % Part 2 ( Part 2.2 = Part 1) - d8:32( | - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | - g4) \flamd d16. g32 d8:32( g8.) g16 | - d4.:32( d4) d8:32( | - - \break - - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - - \break - d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | - - \break - - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) - \bar "|." - }% End of drums % - } - \header { - title = "Alexander MacKenzie" - meter = "Slow March" - composer = "E.T. de Boone, 2015" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily new file mode 100755 index 0000000..51fa66c --- /dev/null +++ b/airs/alexander_mackenzie/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Alexander MacKenzie" +meter = "Slow March" \ No newline at end of file diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily new file mode 100755 index 0000000..dfb6475 --- /dev/null +++ b/airs/alexander_mackenzie/notes.side.ily @@ -0,0 +1,28 @@ +% 6/8 Alexander MacKenzie +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | + + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) +} +snareBA = \drummode { + d8:32( | + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | + g4) \flamd d16. g32 d8:32( g8.) g16 | + d4.:32( d4) d8:32( | + + g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) +} \ No newline at end of file diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly new file mode 100755 index 0000000..7f7d71a --- /dev/null +++ b/airs/alexander_mackenzie/side.ly @@ -0,0 +1,29 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break } \break + \part \line \bar "||" \break + \part \line \bar "|." + } + { + \snareA s8 + + \snareBA s8 + \snareA s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/amazing_grace.side.ly b/airs/amazing_grace.side.ly deleted file mode 100755 index 6e5136a..0000000 --- a/airs/amazing_grace.side.ly +++ /dev/null @@ -1,48 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 3/4 - - \drummode { - \partial 4 - \flamd d8. g16 | - - \repeat volta 2{ - \flamd d2)\! \flamd d8 g16 d16 | - \flamd d2 \flamd d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | - \break - - \flamd d2 \flamd d8 g16 d16 | - \flamd d2 \flamd d8. \flamg g16-> | - d4:32(\< d4:32)( d4:32)(\> | - d4:32)(\! d4:32)( d4:32)(\< | - \break - - d2->)\! d8 g16 d16 | - \flamd d2 d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | - \break - - \flamd d2 d8 g16 d16 | - \flamd d2 \dragd d4 | - d4:32(\> d4:32)( d4:32)(\! | - d4:32)( d4:32)(\< d4:32)( - \break - \bar "||" - } - \bar "|." - }% End of drums % - } - \header { - title = "Amazing Grace" - meter = "Hymn" - composer = "E.T. de Boone, 2015" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily new file mode 100755 index 0000000..f632530 --- /dev/null +++ b/airs/amazing_grace/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s4*3 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Amazing Grace" +meter = "Hymn" \ No newline at end of file diff --git a/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily new file mode 100755 index 0000000..1de8d94 --- /dev/null +++ b/airs/amazing_grace/notes.side.ily @@ -0,0 +1,31 @@ +% 3/4 Amazing Grace +% Side +\version "2.18.2" +composerSide = "" +snarePart = \drummode { + \flamd d8. g16 | +} +snareAA = \drummode { + \flamd d2)\! \flamd d8 g16 d16 | + \flamd d2 \flamd d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | +} +snareAB = \drummode { + \flamd d2 \flamd d8 g16 d16 | + \flamd d2 \flamd d8. \flamg g16-> | + d4:32(\< d4:32)( d4:32)(\> | + d4:32)(\! d4:32)( d4:32)(\< | +} +snareAC = \drummode { + d2->)\! d8 g16 d16 | + \flamd d2 d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | +} +snareAD = \drummode { + \flamd d2 d8 g16 d16 | + \flamd d2 \dragd d4 | + d4:32(\> d4:32)( d4:32)(\! | + d4:32)( d4:32)(\< d4:32)( +} \ No newline at end of file diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly new file mode 100755 index 0000000..0600314 --- /dev/null +++ b/airs/amazing_grace/side.ly @@ -0,0 +1,34 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \part + \repeat volta 2{ + \line \break + \line \break + \line \break + \line \break + } + } + { + \snarePart + \snareAA + \snareAB + \snareAC + \snareAD + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily index b6df39f..94eb300 100755 --- a/airs/farewell_to_camraw/config.ily +++ b/airs/farewell_to_camraw/config.ily @@ -6,4 +6,8 @@ global = { } %% Format -formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } \ No newline at end of file +formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } + +%% Headers +title = "Farewell to Camraw" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly index 92f2d83..56172bd 100755 --- a/airs/farewell_to_camraw/drums.ly +++ b/airs/farewell_to_camraw/drums.ly @@ -8,8 +8,8 @@ \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \global << @@ -17,22 +17,34 @@ \snareA >> } - %\new PipeBandDrumStaff = "bass" { - % \set PipeBandDrumStaff.instrumentName = #"Bass " - % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " - % - % \bassA - % \bassB - %} + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + %\bassA + %\bassB + } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \tenorA } >> \header { - title = "Farewell to Camraw" - meter = "Slow Air" + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily index e2bb443..da799f2 100755 --- a/airs/farewell_to_camraw/notes.side.ily +++ b/airs/farewell_to_camraw/notes.side.ily @@ -1,6 +1,7 @@ % 4/4 Farewell to Camraw % Side \version "2.18.2" +composerSide = "" snareA = \drummode { r1 | r1 | diff --git a/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily index 5fa2cd2..a109de9 100755 --- a/airs/farewell_to_camraw/notes.tenor.ily +++ b/airs/farewell_to_camraw/notes.tenor.ily @@ -1,6 +1,7 @@ % 4/4 Farewell to Camraw % Tenor \version "2.18.2" +composerTenor = "" tenorA = \drummode { R1 r8 g d16 g d g d8 g d16 g d g | diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly index 5bc5872..88a31ab 100755 --- a/airs/farewell_to_camraw/side.ly +++ b/airs/farewell_to_camraw/side.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Farewell to Camraw" - meter = "Slow Air" - instrument = "Side" + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide } } \ No newline at end of file diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly index bf21971..ce31ef0 100755 --- a/airs/farewell_to_camraw/tenor.ly +++ b/airs/farewell_to_camraw/tenor.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Farewell to Camraw" - meter = "Slow Air" - instrument = "Tenor" + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor } } \ No newline at end of file diff --git a/airs/flower_of_scotland.side.ly b/airs/flower_of_scotland.side.ly deleted file mode 100755 index e9ac587..0000000 --- a/airs/flower_of_scotland.side.ly +++ /dev/null @@ -1,38 +0,0 @@ -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 6/8 - - \drummode { - \repeat volta 2 { - \partial 8 g8 | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - \break - d4.:32( d4.) | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - \break - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \break - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d4 | - - } - } - } - \header { - title = "Flower of Scotland" - meter = "Air" - } -} \ No newline at end of file diff --git a/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily new file mode 100755 index 0000000..9d30712 --- /dev/null +++ b/airs/flower_of_scotland/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Flower of Scotland" +meter = "Air" \ No newline at end of file diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily new file mode 100755 index 0000000..b702d19 --- /dev/null +++ b/airs/flower_of_scotland/notes.side.ily @@ -0,0 +1,26 @@ +% 6/8 Flower of Scotland +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + g8 | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + + d4.:32( d4.) | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d4 +} \ No newline at end of file diff --git a/airs/flower_of_scotland/side.ly b/airs/flower_of_scotland/side.ly new file mode 100755 index 0000000..05b1c0f --- /dev/null +++ b/airs/flower_of_scotland/side.ly @@ -0,0 +1,24 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 { + \part + \repeat unfold 4 { \line \break } + } + } + { \snareA s8 } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/loch_duich.side.ly b/airs/loch_duich.side.ly deleted file mode 100755 index bd466d0..0000000 --- a/airs/loch_duich.side.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | - } - \break - \repeat volta 2 { - d4)\! g8 d8:32( d8) g8 | - d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | - - \flamg g4 g8 d8:32( d8) g8 | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | - } - \break - \repeat volta 2 { - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d8 g16 d-> g g d4.:32(\< | - - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - } - \alternative { - { - \dragd d16 d-> g g \flamd d8 d4.:32(\< | - } - { - \dragd d16)\! d-> g g \flamd d8 \flamd d4. | - } - } - }% End of drums % - } - \header { - title = "Loch Duich" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/loch_duich/config.ily b/airs/loch_duich/config.ily new file mode 100755 index 0000000..21973bf --- /dev/null +++ b/airs/loch_duich/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Loch Duich" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily new file mode 100755 index 0000000..2c76ef3 --- /dev/null +++ b/airs/loch_duich/notes.side.ily @@ -0,0 +1,46 @@ +% 6/8 Loch Duich +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareB = \drummode { + d4)\! g8 d8:32( d8) g8 | + d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | + + \flamg g4 g8 d8:32( d8) g8 | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareCA = \drummode { + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d8 g16 d-> g g d4.:32(\< | + + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | +} +snareCBA = \drummode { + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareCBB = \drummode { + \dragd d16)\! d-> g g \flamd d8 \flamd d4. | +} \ No newline at end of file diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly new file mode 100755 index 0000000..1d78b2d --- /dev/null +++ b/airs/loch_duich/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line \break} + \repeat volta 2 { \line \break} + \repeat volta 2 { \halfline s2. s2.} + \alternative { + { s2.} {s2.} + } + } + { + \snareA + \snareB + \snareCA + \snareCBA + \snareCBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/miss_kirkwood.side.ly b/airs/miss_kirkwood.side.ly deleted file mode 100755 index a4a2466..0000000 --- a/airs/miss_kirkwood.side.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - d4.:32( d4) g8 | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d2.:32(\< | - \break - d8)\! \flamg g8. g16 d4:32( d8) | - d8:32( d8.) g16 d4.:32( | - d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4) r8 - } - \break - \repeat volta 2 { - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | - \break - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4) r8 - } - }% End of drums % - } - \header { - title = "Miss Kirkwood" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/miss_kirkwood/config.ily b/airs/miss_kirkwood/config.ily new file mode 100755 index 0000000..e722bbd --- /dev/null +++ b/airs/miss_kirkwood/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Miss Kirkwood" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/miss_kirkwood/notes.side.ily b/airs/miss_kirkwood/notes.side.ily new file mode 100755 index 0000000..949703e --- /dev/null +++ b/airs/miss_kirkwood/notes.side.ily @@ -0,0 +1,25 @@ +% 6/8 Miss Kirkwood +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + d4.:32( d4) g8 | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d2.:32(\< | + + d8)\! \flamg g8. g16 d4:32( d8) | + d8:32( d8.) g16 d4.:32( | + d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4.) +} +snareB = \drummode { + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/airs/miss_kirkwood/side.ly b/airs/miss_kirkwood/side.ly new file mode 100755 index 0000000..12e7762 --- /dev/null +++ b/airs/miss_kirkwood/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\line \break} + \repeat volta 2 {\line \break} + } + { + \snareA + \snareB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly index 15447aa..877f709 100755 --- a/airs/morag_of_dunvegan/bass.ly +++ b/airs/morag_of_dunvegan/bass.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Morag of Dunvegan" - meter = "Slow Air" - instrument = "Bass" + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily index 5c596f9..b6ac8da 100755 --- a/airs/morag_of_dunvegan/config.ily +++ b/airs/morag_of_dunvegan/config.ily @@ -6,4 +6,13 @@ global = { %% Format formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } -formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file +formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } + +%% Headers +title = "Morag of Dunvegan" +meter = "Slow Air" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly index 76d2545..aab186d 100755 --- a/airs/morag_of_dunvegan/drums.ly +++ b/airs/morag_of_dunvegan/drums.ly @@ -8,8 +8,8 @@ \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \global << @@ -18,22 +18,34 @@ >> } \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = #"Bass " - \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \bassA \bassB } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \tenorA \tenorB } >> \header { - title = "Morag of Dunvegan" - meter = "Slow Air" + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly index 013d4f7..e51dc55 100755 --- a/airs/morag_of_dunvegan/side.ly +++ b/airs/morag_of_dunvegan/side.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Morag of Dunvegan" - meter = "Slow Air" - instrument = "Side" + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide } } \ No newline at end of file diff --git a/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly index 79f8985..aade5e1 100755 --- a/airs/morag_of_dunvegan/tenor.ly +++ b/airs/morag_of_dunvegan/tenor.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Morag of Dunvegan" - meter = "Slow Air" - instrument = "Tenor" + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor } } \ No newline at end of file diff --git a/airs/my_home.side.ly b/airs/my_home.side.ly deleted file mode 100755 index c532bfc..0000000 --- a/airs/my_home.side.ly +++ /dev/null @@ -1,40 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \partial 8 d8:32( | - g8.) d16 g8 \flamd d8. g16 d8 | - \flamg g8. d16 g8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) - } - \repeat volta 2 { - \partial 8 d8 | - \flamd d8. g16 d8 d4.:32( - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - \flamd d8. g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) - } - }% End of drums % - } - \header { - title = "My Home" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/my_home/config.ily b/airs/my_home/config.ily new file mode 100755 index 0000000..ad9fc49 --- /dev/null +++ b/airs/my_home/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "My Home" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/my_home/drums.ly b/airs/my_home/drums.ly new file mode 100755 index 0000000..3eb253f --- /dev/null +++ b/airs/my_home/drums.ly @@ -0,0 +1,54 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat volta 2 { \part \line \break} + \repeat volta 2 { \part \line \break} + } + { + \snareA s8 + \snareB s8 + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat unfold 2 { s8 \tenorA } + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily new file mode 100755 index 0000000..ca8b4b2 --- /dev/null +++ b/airs/my_home/notes.side.ily @@ -0,0 +1,26 @@ +% 6/8 My Home +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + d8:32( | + g8.) d16 g8 \flamd d8. g16 d8 | + \flamg g8. d16 g8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) +} +snareB = \drummode { + d8 | + \flamd d8. g16 d8 d4.:32( + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d8. g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) +} \ No newline at end of file diff --git a/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily new file mode 100755 index 0000000..ab14c75 --- /dev/null +++ b/airs/my_home/notes.tenor.ily @@ -0,0 +1,15 @@ +% 6/8 My Home +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { + d4 d8 g8. d16 g8 | + d4. g4 d8 | + d4. g4 d8 | + d8. g8 d16 d4.| + + d8. g16 d8 g4. | + d4 d8 g4. | + r8 g8 d8 r8 d8 g8 + d8 g8 d8 g4. +} \ No newline at end of file diff --git a/airs/my_home/side.ly b/airs/my_home/side.ly new file mode 100755 index 0000000..b97df0f --- /dev/null +++ b/airs/my_home/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break} + \repeat volta 2 { \part \line \break} + } + { + \snareA s8 + \snareB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/my_home/tenor.ly b/airs/my_home/tenor.ly new file mode 100755 index 0000000..da4d91d --- /dev/null +++ b/airs/my_home/tenor.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line \break} + \repeat volta 2 { \line \break} + + } + { + \repeat unfold 2 { \tenorA } + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily index 8b3fc9d..cabb9bf 100755 --- a/airs/the_mist_covered_mountains/config.ily +++ b/airs/the_mist_covered_mountains/config.ily @@ -7,4 +7,13 @@ global = { part = {\partial 8 s8 } %% Format formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } -formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } \ No newline at end of file +formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } + +%% Headers +title = "The Mist Covered Mountains" +meter = "Slow Air" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly index 4ef51dc..6e7918c 100755 --- a/airs/the_mist_covered_mountains/drums.ly +++ b/airs/the_mist_covered_mountains/drums.ly @@ -8,8 +8,8 @@ \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \global << @@ -17,23 +17,35 @@ {\snareA \snareB } >> } - %\new PipeBandDrumStaff = "bass" { - % \set PipeBandDrumStaff.instrumentName = #"Bass " - % \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " - % - % \bassA - % \bassB - %} + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + %\bassA + %\bassB + } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \tenorA \tenorB } >> \header { - title = "The Mist Covered Mountains" - meter = "Slow Air" + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly index e9a3db1..bcc942a 100755 --- a/airs/the_mist_covered_mountains/side.ly +++ b/airs/the_mist_covered_mountains/side.ly @@ -12,8 +12,9 @@ >> } \header { - title = "The Mist Covered Mountains" - meter = "Slow Air" - instrument = "Side" + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide } } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly index c1c8324..9231675 100755 --- a/airs/the_mist_covered_mountains/tenor.ly +++ b/airs/the_mist_covered_mountains/tenor.ly @@ -12,8 +12,9 @@ >> } \header { - title = "The Mist Covered Mountains" - meter = "Slow Air" - instrument = "Tenor" + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor } } \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly deleted file mode 100755 index 10897e1..0000000 --- a/airs/the_mist_covered_mountains/the_mist_covered_mountains.side.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \partial 8 d8:32( | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d8)[ r8 d8:32(] | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d4.) | - } - \break - \repeat volta 2 { - \partial 8 d8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - d2.:32( | - d8.)-> g16 d8 g8 r8 g8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - r8 g8 d8 r8 d8 g8 | - d4.:32( d4.) | - } - }% End of drums % - } - \header { - title = "The Mist Covered Mountains" - meter = "Slow Air" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly b/airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly deleted file mode 100755 index 2bb4a0a..0000000 --- a/airs/the_mist_covered_mountains/the_mist_covered_mountains.tenor.ly +++ /dev/null @@ -1,37 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \drummode { - \time 6/8 - \repeat volta 2 { - d4. g | - d4. g8 r8 g8 | - d4. g8. d16 g8 | - d8. g16 d8 g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - d4. g8. d16 g8 | - d8 g8 d8 g8 r4 - } - \repeat volta 2 { - d4. g | - d4. g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - r8. g16 d8 r8. d16 g8 | - d8 g8 d8 g8 r4 - } - } - } - - \header { - title = "The Mist Covered Mountains" - meter = "Slow Air" - instrument = "Tenor" - } -} \ No newline at end of file diff --git a/hornpipes/itchy_fingers.side.ly b/hornpipes/itchy_fingers.side.ly deleted file mode 100755 index 3bdad69..0000000 --- a/hornpipes/itchy_fingers.side.ly +++ /dev/null @@ -1,62 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 2/4 - \eighthBeaming - - \drummode { - \repeat volta 2 { - \partial 8 r8 | - \flamd d16^"2 of 2"-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> d8:32( | - - g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | - d16) g16-> d32 g d g d4:32( | - - \break - \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> - } - \break - \repeat volta 2 { - \partial 8 d16 g16 | - d32-> g d g d g d g d16-> g d d | - g32-> d g d g-> d g d g16-> d g g | - - d32-> g d g d g d-> g d g d g d8-> | - d16-> d16:64( d16) g16 d4:32(-> | - \break - } - \alternative { - { - d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | - d16 g16-> d32 g d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> - \break - } - { - d16[)-> g d \flamg g]-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> - \bar "|." - } - } - }% End of drums % - } - \header { - title = "Itchy Fingers" - meter = "Hornpipe" - composer = "Dean Hall, 1995" - instrument = "Side" - } -} \ No newline at end of file diff --git a/hornpipes/itchy_fingers/config.ily b/hornpipes/itchy_fingers/config.ily new file mode 100755 index 0000000..33db2fe --- /dev/null +++ b/hornpipes/itchy_fingers/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Itchy Fingers" +meter = "Hornpipe" \ No newline at end of file diff --git a/hornpipes/itchy_fingers/notes.side.ily b/hornpipes/itchy_fingers/notes.side.ily new file mode 100755 index 0000000..3babef6 --- /dev/null +++ b/hornpipes/itchy_fingers/notes.side.ily @@ -0,0 +1,35 @@ +% 2/4 Itchy Fingers +% Side +\version "2.18.2" +composerSide = "Dean Hall, 1995" +snareAA = \drummode { + \flamd d16-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> d8:32( | + + g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | + d16) g16-> d32 g d g d4:32( | +} +snareAB = \drummode { + \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> +} + +snareBA = \drummode { + d16 g16 | + d32-> g d g d g d g d16-> g d d | + g32-> d g d g-> d g d g16-> d g g | + + d32-> g d g d g d-> g d g d g d8-> | + d16-> d16:64( d16) g16 d4:32(-> | +} + +snareBBA = \drummode { + d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | + d16 g16-> d32 g d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> +} \ No newline at end of file diff --git a/hornpipes/itchy_fingers/side.ly b/hornpipes/itchy_fingers/side.ly new file mode 100755 index 0000000..e71eb1f --- /dev/null +++ b/hornpipes/itchy_fingers/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 {\line \break} + \repeat volta 2 {\part \halfline \break} + \alternative { {\halfline \break} {\halfline \break } } + } + { \snareAA \snareAB s8 + \snareBA + \snareBBA s8 + \snareAB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks.side.ly b/jigs/seaforth_sticks.side.ly deleted file mode 100755 index 8ad3e86..0000000 --- a/jigs/seaforth_sticks.side.ly +++ /dev/null @@ -1,155 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff = "staff_side" { - \set Staff.instrumentName = #"Side" - \set Staff.shortInstrumentName = #"S.D." - - \time 6/8 - \drummode { - \mark \default - \repeat volta 2{ - \partial 8 r8 | - \flamd d8 g8 d8 \flamg g4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \flamg g4 g8 | - d4.:32(-> d8) g8 g8 | - - \flamd d8 g8 d8 \flamg g4 g8 | - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) - } - \break - % B - \mark \default - \repeat volta 2{ - \partial 8 g8 | - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8 d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ g8 | - - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) - } - \break - % C - \mark \default - \repeat volta 2{ - \partial 8 d8:32( | - d4) \flamd d8 g8 d8 g8-^| - d16 g d g d8 g8 d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | - - d4) \flamd d8 g8 d8 g8-^| - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) - } - \break - % D - \mark \default - \repeat volta 2{ - \partial 8 g8 | - d4.:32(-> g8) d8 g8| - d4.:32(-> g8) d8 g8| - - \flamd d8 g8 g8 \flamg g4 g8-^ | - d8 g8 \flamg g8-^ \flamg g4 g8 | - - d4.:32(-> g8) d8 g8| - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) - } - - \break - %E - \mark \default - \repeat volta 2{ - \partial 8 r8 | - \flamd d8 g8 d8 \backstick d4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d4.:32(-> d8) g8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d4.:32( d4.) - } - \break - % F - \mark \default - \repeat volta 2{ - \partial 8 g8 | - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8^"Y" d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | - - d4.:32(-> d8) g8 g8 | - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> db4 g8 | - d4.:32( d4.) - } - \break - - \mark \default - \repeat volta 2{ - \partial 8 d8:32( | - d4)-^ \backstick d8 g8 d8 g8-^| - d16 g d g d8 g8 d8 g8 | - - \flamd d8 g8 d8 \backstick g4 d8 g8 | - \flamd d8 g8 g8 \backstick d4 d8:32( | - - d4)-> \backstick d8 g8 d8 g8| - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g d8-> \backstick g4 d8 g8 | - d4.:32( d4.) - } - \break - % H - \mark \default - \repeat volta 2{ - \partial 8 g8 | - \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| - - \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | - - \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| - - \flam d8 g8 d8 \backstick d4 g8 | - d4.:32( d4.) - } - - } - } - \header { - title = "Seaforth Sticks" - meter = "Jig" - } -} - diff --git a/jigs/seaforth_sticks/config.ily b/jigs/seaforth_sticks/config.ily new file mode 100755 index 0000000..74af3c4 --- /dev/null +++ b/jigs/seaforth_sticks/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Seaforth Sticks" +meter = "Jig" \ No newline at end of file diff --git a/jigs/seaforth_sticks/drums.ly b/jigs/seaforth_sticks/drums.ly new file mode 100755 index 0000000..a0ee950 --- /dev/null +++ b/jigs/seaforth_sticks/drums.ly @@ -0,0 +1,65 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + }%Format + { + \snareA + \snareB + \snareC + \snareD + \snareE + \snareF + \snareG + \snareH + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.bass.ily b/jigs/seaforth_sticks/notes.bass.ily new file mode 100755 index 0000000..ad900bf --- /dev/null +++ b/jigs/seaforth_sticks/notes.bass.ily @@ -0,0 +1,6 @@ +% 6/8 Seaforth Sticks +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily new file mode 100755 index 0000000..6d87e50 --- /dev/null +++ b/jigs/seaforth_sticks/notes.side.ily @@ -0,0 +1,123 @@ +% 6/8 Seaforth Sticks +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + r8 | + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%B +snareB = \drummode { + g8 | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ g8 | + + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%C +snareC = \drummode { + d8:32( | + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | + + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%D +snareD = \drummode { + g8 | + d4.:32(-> d8) g8 g8| + d4.:32(-> d8) g8 g8| + + \flamd d8 g8 d8 \flamg g4 g8-^ | + d8 g8 \flamg g8-^ \flamg g4 g8 | + + d4.:32(-> d8) g8 g8| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%E +snareE = \drummode { + r8 | + \flamd d8 g8 d8 \backstick d4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d4.:32( d4.) +} +%F +snareF = \drummode { + g8 | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8^"Y" d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | + + d4.:32(-> d8) g8 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> db4 g8 | + d4.:32( d4.) +} +%G +snareG = \drummode { + d8:32( | + d4)-^ \backstick d8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + \flamd d8 g8 g8 \backstick d4 d8:32( | + + d4)-> \backstick d8 g8 d8 g8| + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g d8-> \backstick d4 g8 | + d4.:32( d4.) +} +%H +snareH = \drummode { + g8 | + \flamd d8 d16 g16 d8 \repeat unfold 3 { \crossstick sn8^"X" }| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flamd d8 g8 d8 \backstick d4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | + + \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flam d8 g8 d8 \backstick d4 g8 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.tenor.ily b/jigs/seaforth_sticks/notes.tenor.ily new file mode 100755 index 0000000..27cfe63 --- /dev/null +++ b/jigs/seaforth_sticks/notes.tenor.ily @@ -0,0 +1,6 @@ +% 6/8 Seaforth Sticks +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/side.ly b/jigs/seaforth_sticks/side.ly new file mode 100755 index 0000000..c91b947 --- /dev/null +++ b/jigs/seaforth_sticks/side.ly @@ -0,0 +1,38 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + } + { + \snareA + \snareB + \snareC + \snareD + \snareE + \snareF + \snareG + \snareH + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly new file mode 100755 index 0000000..e12bc43 --- /dev/null +++ b/jigs/seaforth_sticks/tenor.ly @@ -0,0 +1,29 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + } + {} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/strathspeys/aa_camerons.snare.ly b/strathspeys/aa_camerons.snare.ly deleted file mode 100755 index e20d762..0000000 --- a/strathspeys/aa_camerons.snare.ly +++ /dev/null @@ -1,51 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - % Part 1 - \repeat volta 2 { - \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8. \dragd d16 \tuplet 3/2 { d16 g d g d8 } g4:32(-> | - d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8 g8 \dragd d8 } \tuplet 3/2 { d16 g d g d8 } | - } - \alternative { - { - g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | - \tuplet 3/2 { \flamd d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } - } - { - g8.-> g16 \tuplet 3/2 { d16-> g d g \dragd d8 } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | - \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } - } - } - - \break - - % Part 2 - \repeat volta 2 { - d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | - d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | - } - \alternative { - { - \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | - g8. d16 \tuplet 3/2 { \flamg g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } - } - { - \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | - d8.) g16 \tuplet 3/2 { \flamd d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } - } - } - }% End of drums % - } - \header { - title = "A. A. Cameron's Strathspey" - meter = "Strathspey" - composer = "G. Clark, 1988" - instrument = "Side" - } -} \ No newline at end of file diff --git a/strathspeys/aa_camerons/config.ily b/strathspeys/aa_camerons/config.ily new file mode 100755 index 0000000..2f9ab87 --- /dev/null +++ b/strathspeys/aa_camerons/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "A. A. Cameron's Strathspey" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/aa_camerons/notes.side.ily b/strathspeys/aa_camerons/notes.side.ily new file mode 100755 index 0000000..d5cf8fd --- /dev/null +++ b/strathspeys/aa_camerons/notes.side.ily @@ -0,0 +1,30 @@ +% 4/4 A. A. Cameron's Strathspey +% Side +\version "2.18.2" +composerSide = "G. Clark, 1988" +snareAA = \drummode { + \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8.[ \dragd d16] \tuplet 3/2 { d16 g d g d8 } g4:32(-> | + d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8[ g8 \dragd d8] } \tuplet 3/2 { d16 g d g d8 } | +} +snareABA = \drummode { + g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | + \flamd \tuplet 3/2 { d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } +} +snareABB = \drummode { + g8.-> g16 \tuplet 3/2 { d16[-> g d g \dragd d8] } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | + \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } +} + +% Part 2 +snareBA = \drummode { + d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | + d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | +} +snareBBA = \drummode { + \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | + g8. d16 \flamg \tuplet 3/2 { g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } +} +snareBBB = \drummode { + \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | + d8.) g16 \flamd \tuplet 3/2 { d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } +} \ No newline at end of file diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly new file mode 100755 index 0000000..c23854f --- /dev/null +++ b/strathspeys/aa_camerons/side.ly @@ -0,0 +1,39 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 2 { + \repeat volta 2 { \halfline } + \alternative { + {\halfline} + {\halfline } + } + \break + } + \bar "|." + } + { + \snareAA + \snareABA + \snareABB + + + \snareBA + \snareBBA + \snareBBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly index 25189f7..649db5e 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/bass.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/bass.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - instrument = "Bass" + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass } } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily index 2c24775..685b8f8 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/config.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily @@ -5,5 +5,9 @@ global = { } %% Format -part = {\partial 16 s16 } +part = { \partial 16 s16 } line = { \repeat unfold 4 { s1 | } } + +%% Headers +title = "Lady MacKenzie of Fairburn" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly index 16d48ed..fe6eee2 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/drums.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/drums.ly @@ -9,35 +9,43 @@ \new StaffGroup << \new PipeBandDrumStaff = "side" { \global - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} << { \repeat volta 2 {\line } \break \part \line \break \line \bar "|."} - { \snareA s16 \snareBA \snareBB } + { \snareA s16 \snareBA \snareBB } >> } \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = #"Bass " - \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \bassA - s16 - \bassBA - \bassBB + s16 \bassBA \bassBB } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \tenorA - s16 - \tenorBA - \tenorBB + s16 \tenorBA \tenorBB } >> \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly index 8f9d2e5..ffcdbce 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/full.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly @@ -11,43 +11,54 @@ \new Staff { \global \bagpipeKey - \set PipeBandDrumStaff.instrumentName = #"Pipes " - \set PipeBandDrumStaff.shortInstrumentName = #"P." + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } << - {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + { \repeat volta 2 { \part \line } + \break \part \line \bar "||" + \break \line \bar "|." + } {\pipesA s16 \pipesBA \pipesBB} >> } \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = #"Side " - \set PipeBandDrumStaff.shortInstrumentName = #"S.D. " + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - s16 \snareA s16 - \snareBA \snareBB + s16 \snareA + s16 \snareBA \snareBB } \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = #"Bass " - \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - s16 - \bassA - s16 - \bassBA - \bassBB + s16 \bassA + s16 \bassBA \bassBB } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - s16 - \tenorA - s16 - \tenorBA - \tenorBB + s16 \tenorA + s16 \tenorBA \tenorBB } >> \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily index 017ffb8..635f277 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily @@ -1,6 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Bass \version "2.18.2" +composerBass = "E.T. de Boone, v0.8, 2015" bassA = \drummode { bd4 bd4-> r4 bd4 | @@ -11,8 +12,14 @@ bassA = \drummode { bd4 r4 bd4-> bd4 } bassBA = \drummode { - s1*4 + bd4 r4 bd4 bd | + bd4 r4 bd4 r4 | + bd4 bd4 bd4 bd | + bd8 bd8 r8 bd8 r8 bd8 bd4 | } bassBB = \drummode { - s1*4 + bd4 r4 bd4 bd | + bd4 r4 bd4 r4 | + bd4 bd4 bd8 bd8 r4 | + bd8 bd8 r8 bd8 r8 bd8 bd4 | } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily index 469157a..f41998c 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -1,6 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Pipes \version "2.18.2" +composerPipes = "" pipesA = { d16 | \dblc c8. e16 diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily index 3623901..67a647c 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -1,68 +1,69 @@ % 4/4 Lady MacKenzie of Fairburn % Side \version "2.18.2" +composerSide = "E.T. de Boone, v0.8, 2015" snareA = \drummode { \flam d8. g16 d8.:32( g16) + \flamd \triplet { d8 \dr \< g16 g d8 } + \flam g8.-> \! \fr \parenthesize g16 + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> \dr g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. \fr g16 -> + \triplet { d16\< g d g d8 } + g16\! d8. + | + d8.[:32(\< \dr g16]:32)(-> \> + d8.[:32)( g16]:32)(-> \< + d8.[:32)( g16]:32)(-> + d8.) \! \fr +} +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d } + \triplet {g d \flam g } + \triplet {d8 g \flam d \dr } + \flam g8. g16 + | + \flam d16. d32 \flam g8 \fr + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 \dr + | + \flam d8. \fr g16 + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8.[:32(\< \dr g16]:32)(-> \> + d8.[:32)( g16]:32)(-> \< + d8.[:32)( g16]:32)(-> + d8.) \! +} +snareBB = \drummode{ + g16 \fr | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8 g16 + d8.:32( g16) \flam d8 \< \triplet {d16 g d } \flam g4-> \! | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. g16 - \triplet { d16 g d g d8 } - g8 g8 - | - d8.[:32( g16]:32)(-> - d8.[:32)( g16]:32)(-> + d8.[:32( g16]:32)(-> + d8.:32)( g16]:32)(-> d8.[:32)( g16]:32)(-> d8.) -} -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8.:32( g16:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8. - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8.[:32( g16]:32)(-> - d8.[:32)( g16]:32)(-> - d8.[:32)( g16]:32)(-> - d8.) -} -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8.:32( g16:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - {\flam d8.} g16 - d8.:32( g16) - \flam d8 \< \triplet {d16 g d } - \flam g4-> \! - | - d8.[:32( g16]:32)(-> - d8.:32)( g16]:32)(-> - d4:32)(-> - d8.) } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily index 149d21f..6e93fb8 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily @@ -1,6 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Tenor \version "2.18.2" +composerTenor = "E.T. de Boone, v0.8, 2015" tenorA = \drummode { d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> | @@ -12,9 +13,44 @@ tenorA = \drummode { | } tenorBA = \drummode { - s1*2 - s1*2 + \triplet { d8 \< g d } + \triplet { g8 d g } + \triplet { d8 g d } + g8. \! g16 + | + d8. g16-> + r8. g16 + d8. g16-> + r4 + | + d8. g16 + d4 + g8. d16 + g4 + | + d8 \flourish g8 + r8 \flourish d8 + r8 g8 + d4 } tenorBB = \drummode { - s1*4 + \triplet { d8 \< g d } + \triplet { g8 d g } + \triplet { d8 g d } + g8. \! g16 + | + d8.^"begin scoop" \dr g16-> + r8. g16 + d8.^"end scoop" \fr g16-> + r4 + | + d16 g8. + \flourish d4 + g8. d16 + \flourish g4 + | + \triplet { d8 g d } + g4 + d8. g16 + d4 } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly index b08c1c2..711e24c 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -13,8 +13,9 @@ >> } \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - instrument = "Pipes" + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes } } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly index e5d3d4d..e82ac70 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/side.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly @@ -7,13 +7,14 @@ \new PipeBandDrumStaff { \global << - {\repeat volta 2 { \line } \break \part \line \break \line \bar "|."} + {\repeat volta 2 { \line } \break \part \line \bar "||" \break \line \bar "|."} {\snareA s16 \snareBA \snareBB} >> } \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - instrument = "Side" + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide } } \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly index f302af2..896c011 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly +++ b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Lady MacKenzie of Fairburn" - meter = "Strathspey" - instrument = "Tenor" + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor } } \ No newline at end of file diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly index 179bf08..5377e71 100755 --- a/strathspeys/molly_connell/bass.ly +++ b/strathspeys/molly_connell/bass.ly @@ -12,8 +12,9 @@ >> } \header { - title = "Molly Connell" - meter = "Strathspey" - instrument = "Bass" + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass } } \ No newline at end of file diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily index cdd114c..7c7ab19 100755 --- a/strathspeys/molly_connell/config.ily +++ b/strathspeys/molly_connell/config.ily @@ -2,7 +2,12 @@ %% Globals global = { \time 4/4 + \tempo 4 = 120 } %% Format -part = {\partial 8 s8 } +part = { \partial 8 s8 } line = { \repeat unfold 4 { s1 } } + +%% Headers +title = "Molly Connell" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly index e0873ea..c46ce33 100755 --- a/strathspeys/molly_connell/drums.ly +++ b/strathspeys/molly_connell/drums.ly @@ -3,13 +3,13 @@ \include "config.ily" \include "notes.bass.ily" \include "notes.tenor.ily" -\include "notes.side.ily" +\include "notes.side.v1.1.ily" \score { \new StaffGroup << \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = #"Side" - \set PipeBandDrumStaff.shortInstrumentName = #"S.D." + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} \global << @@ -35,8 +35,8 @@ >> } \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = #"Bass " - \set PipeBandDrumStaff.shortInstrumentName = #"B.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} \bassAA \bassAB @@ -47,8 +47,8 @@ \bassAB } \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = #"Tenor" - \set PipeBandDrumStaff.shortInstrumentName = #"T.D. " + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } \tenorA \tenorA @@ -60,7 +60,19 @@ } >> \header { - title = "Molly Connell" - meter = "Slow Air" + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } } } \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily index d489740..a1af8bb 100755 --- a/strathspeys/molly_connell/notes.bass.ily +++ b/strathspeys/molly_connell/notes.bass.ily @@ -1,6 +1,7 @@ % 4/4 Molly Connell % Bass \version "2.18.2" +composerBass = "W.H. de Boone / E.T. de Boone, 2014" bassAA = \drummode { d4-> g4-> d4 g4 | d4 g4 d4 g4 | diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily index d4a538d..8a5ac64 100755 --- a/strathspeys/molly_connell/notes.side.ily +++ b/strathspeys/molly_connell/notes.side.ily @@ -1,6 +1,7 @@ % 4/4 Molly Connell % Side \version "2.18.2" +composerSide = "v1.0, 21-2-2014" snareA = \drummode { \flam d4 \flam g8.[ d16:64(] d8.[) \drag d16] d8.[ g16] | d8.:64[( g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] | diff --git a/strathspeys/molly_connell/notes.side.v1.1.ily b/strathspeys/molly_connell/notes.side.v1.1.ily new file mode 100755 index 0000000..6466955 --- /dev/null +++ b/strathspeys/molly_connell/notes.side.v1.1.ily @@ -0,0 +1,28 @@ +% 4/4 Molly Connell +% Side +\version "2.18.2" +composerSide = "v1.1, 2015" +snareA = \drummode { + \flamddr d4 \flam g8.[\fr d16:64(] d8.[) \dragddr d16] d8.[ \fr g16] | + d8.:64[(-> g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] \dr | + + d16:64[( d8.]) \fr g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] \dr| + \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 \fr +} + +snareBA = \drummode { + \partial 8 g8 \dr | + d4:32( d8.[) \drag d16] \fr \triplet { d16[ g d g d8] } g8.[ g16] \dr | + \drag d16[ d8.] \flam d8.[ \flam g16] \fr \triplet { d16[ g d g d8] } \triplet { g8[ d g] \dr } | + + \flamd \triplet { d8[ \fr g16 g16 d8] } g8.[ g16]\dr \flamd \triplet { d8[->\fr g16 g16 d8] } g8.[ g16] \dr | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 \fr | +} +snareBB = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[\> d g] } | + + \flam d4 \flam g8.[\! d16:64]( d8.[) \drag d16] d8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily index 4bf45cf..49ada61 100755 --- a/strathspeys/molly_connell/notes.tenor.ily +++ b/strathspeys/molly_connell/notes.tenor.ily @@ -1,6 +1,7 @@ % 4/4 Molly Connell % Tenor \version "2.18.2" +composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, 2014" tenorA = \drummode { d4 g4 d8. g16 d4 d4 g4 r8. g16 d4 | diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly index 44fe070..a1888ef 100755 --- a/strathspeys/molly_connell/side.ly +++ b/strathspeys/molly_connell/side.ly @@ -1,19 +1,20 @@ \version "2.18.2" \include "config.ily" -\include "notes.side.ily" +\include "notes.side.v1.1.ily" \score { \new PipeBandDrumStaff { \global << - {\repeat volta 2 { \line } \break \part \line \break \part \line \bar "|." } + {\repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." } {\snareA s8 \snareBA \snareBB } >> } \header { - title = "Molly Connell" - meter = "Strathspey" - instrument = "Side" + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide } } \ No newline at end of file diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly index c09bfb2..7fc6955 100755 --- a/strathspeys/molly_connell/tenor.ly +++ b/strathspeys/molly_connell/tenor.ly @@ -7,13 +7,14 @@ \new PipeBandDrumStaff { \global << - {\repeat volta 2 {\line} \break \line \break \line \bar "|." } + {\repeat volta 2 {\line} \break \line \bar "||" \break \line \bar "|." } {\tenorA \tenorBA \tenorBB } >> } \header { - title = "Molly Connell" - meter = "Strathspey" - instrument = "Tenor" + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor } } \ No newline at end of file diff --git a/template/config.ily b/template/config.ily new file mode 100755 index 0000000..61c2dff --- /dev/null +++ b/template/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Title" +meter = "Meter" \ No newline at end of file diff --git a/template/drums.ly b/template/drums.ly new file mode 100755 index 0000000..846ee3f --- /dev/null +++ b/template/drums.ly @@ -0,0 +1,47 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { }%Format + { }%Music + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/template/full.ly b/template/full.ly new file mode 100755 index 0000000..bbecdd8 --- /dev/null +++ b/template/full.ly @@ -0,0 +1,55 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" +\include "notes.pipes.ily" + +\score { + \new StaffGroup << + \new Staff { + \global + \bagpipeKey + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + << + {}%Format + {}%Pipes + >> + } + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/template/notes.bass.ily b/template/notes.bass.ily new file mode 100755 index 0000000..4f6752c --- /dev/null +++ b/template/notes.bass.ily @@ -0,0 +1,6 @@ +% <> <> +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/template/notes.pipes.ily b/template/notes.pipes.ily new file mode 100755 index 0000000..db072ff --- /dev/null +++ b/template/notes.pipes.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Pipes +\version "2.18.2" +composerPipes = "" +pipesA = { +} \ No newline at end of file diff --git a/template/notes.side.ily b/template/notes.side.ily new file mode 100755 index 0000000..dbaf43f --- /dev/null +++ b/template/notes.side.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Side +\version "2.18.2" +composerSide = "" +\snareA = \drummode { +} \ No newline at end of file diff --git a/template/notes.tenor.ily b/template/notes.tenor.ily new file mode 100755 index 0000000..f572169 --- /dev/null +++ b/template/notes.tenor.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { +} \ No newline at end of file diff --git a/template/pipes.ly b/template/pipes.ly new file mode 100755 index 0000000..facb3fb --- /dev/null +++ b/template/pipes.ly @@ -0,0 +1,21 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" + +\score { + \new Staff { + \global + \bagpipeKey + << + { } + { } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} \ No newline at end of file diff --git a/template/side.ly b/template/side.ly new file mode 100755 index 0000000..ee8dae0 --- /dev/null +++ b/template/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { } + { } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/template/tenor.ly b/template/tenor.ly new file mode 100755 index 0000000..a96bc97 --- /dev/null +++ b/template/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {} + {} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file From 15ce8e7c1e55c616ec989af034cfa8806fd9d294 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Wed, 18 Nov 2015 03:03:44 +0100 Subject: [PATCH 27/33] various small updates in non-music files --- .lilydrum/embellishments.ily | 44 +++++++++++++++------- .lilydrum/flourishing.ily | 19 +++++++--- .lilydrum/layout_tweaks.ily | 20 +++++++++- .lilydrum/musical_functions.ily | 2 +- airs/my_home/notes.bass.ily | 6 +++ build_all | 8 +++- cheatsheet.ly | 65 ++++++++++++++++++++++++++------- cleanpdfs | 6 --- header_default.ily | 8 +++- makedrum | 1 - standards/44_standards.side.ly | 5 ++- 11 files changed, 137 insertions(+), 47 deletions(-) create mode 100755 airs/my_home/notes.bass.ily delete mode 100755 cleanpdfs diff --git a/.lilydrum/embellishments.ily b/.lilydrum/embellishments.ily index 00fcdb6..a622958 100755 --- a/.lilydrum/embellishments.ily +++ b/.lilydrum/embellishments.ily @@ -1,7 +1,7 @@ % ================================================= % % Flams, Drags & the sort % % ================================================= % -drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ +drumgrace = #(define-music-function (parser location notes ) ( ly:music? ) #{ % Set settings \stemUp \once \override Beam.positions = #'(2 . 2) @@ -11,7 +11,7 @@ drumgrace = #(define-music-function (parser location notes) (ly:music?) #{ \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) % Print notes - \grace $notes + \small \grace $notes % Revert back \revert Score.Stem #'beamlet-default-length @@ -27,22 +27,28 @@ flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start re flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat % Drags -dragd = \drummode { \drumgrace { g16[ g] }} % Drag right -dragg = \drummode { \drumgrace { d16[ d] }} % Drag left -dragddr = \drummode { \drumgrace { g16[\startGroup g] }} % Drag right with start repeat -draggdr = \drummode { \drumgrace { d16[\startGroup d] }} % Drag left with start repeat +dragd = \drummode { \drumgrace { g16[ g] } } % Drag right +dragg = \drummode { \drumgrace { d16[ d] } } % Drag left +dragddr = \drummode { \drumgrace { g16[\startGroup g] } } % Drag right with start repeat +draggdr = \drummode { \drumgrace { d16[\startGroup d] } } % Drag left with start repeat + +% Open Drags +odragd = \drummode { \drumgrace { g16[ s^"o" g] } } % Open Drag right +odragg = \drummode { \drumgrace { d16[ s^"o" d] } } % Open Drag left +odragddr = \drummode { \drumgrace { g16[\startGroup s^"o" g] } } % Open Drag right with start repeat +odraggdr = \drummode { \drumgrace { d16[\startGroup s^"o" d] } } % Open Drag left with start repeat % Ruff -ruffg = \drummode { \drumgrace { g16[ d g] }} % Ruff right -ruffd = \drummode { \drumgrace { d16[ g d] }} % Ruff left -ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] }} % Ruff right with start repeat -ruffddr = \drummode { \drumgrace { d16[\startGroup g d] }} % Ruff left with start repeat +ruffg = \drummode { \drumgrace { g16[ d g] } } % Ruff right +ruffd = \drummode { \drumgrace { d16[ g d] } } % Ruff left +ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] } } % Ruff right with start repeat +ruffddr = \drummode { \drumgrace { d16[\startGroup g d] } } % Ruff left with start repeat % Swiss Ruff -sruffg = \drummode { \drumgrace { g16[ d d] }} % Swiss Ruff right -sruffd = \drummode { \drumgrace { d16[ g g] }} % Swiss Ruff left -sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] }} % Swiss Ruff right with start repeat -sruffddr = \drummode { \drumgrace { d16[\startGroup g g] }} % Swiss Ruff left with start repeat +sruffg = \drummode { \drumgrace { g16[ d d] } } % Swiss Ruff right +sruffd = \drummode { \drumgrace { d16[ g g] } } % Swiss Ruff left +sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] } } % Swiss Ruff right with start repeat +sruffddr = \drummode { \drumgrace { d16[\startGroup g g] } } % Swiss Ruff left with start repeat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Embellishment functions, automatic left or right %% @@ -69,6 +75,16 @@ drag = #(define-music-function (parser location note) (ly:music?) #{ % print the note, else it won't show up $note #}) +% Open Drag +odrag = #(define-music-function (parser location note) (ly:music?) #{ + % is note right-handed? then \flamd + % if left, then \flamg + #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") + #{ \odragg #} + #{ \odragd #}) + % print the note, else it won't show up + $note +#}) % Ruff ruff = #(define-music-function (parser location note) (ly:music?) #{ diff --git a/.lilydrum/flourishing.ily b/.lilydrum/flourishing.ily index 0b47364..bb63976 100755 --- a/.lilydrum/flourishing.ily +++ b/.lilydrum/flourishing.ily @@ -24,13 +24,20 @@ scoop = \markup { (lineto 7 1 ) ) } - +scoopo = #(define-music-function (parser location beg notes) (ly:music? ly:music?) + #{ + %Set spanner from first to last note + $beg + \startGroup + $notes + \stopGroup + #}) flourish = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'cross - $notes - \revert Staff.NoteHead.style - #}) + #{ + \temporary \override Staff.NoteHead.style = #'cross + $notes + \revert Staff.NoteHead.style + #}) sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music?) #{ $notes diff --git a/.lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily index 769841c..054fdbd 100755 --- a/.lilydrum/layout_tweaks.ily +++ b/.lilydrum/layout_tweaks.ily @@ -28,6 +28,7 @@ drumPitchNames = } } \layout { + indent = 0.0 \context { \DrumStaff \name PipeBandDrumStaff @@ -93,4 +94,21 @@ drumPitchNames = \StaffGroup \accepts "PipeBandDrumStaff" } -} \ No newline at end of file +} + +% =================================================== % +% *Shorts* for Naming % +% =================================================== % + +instrumentSide = "Side" +instrumentTenor = "Tenor" +instrumentBass = "Bass" +instrumentPipes = "Pipes" +shortInstrumentSide = "S.D." +shortInstrumentTenor = "T.D." +shortInstrumentBass = "B.D." +shortInstrumentPipes = "P." +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/.lilydrum/musical_functions.ily b/.lilydrum/musical_functions.ily index 4fb0211..7e34480 100755 --- a/.lilydrum/musical_functions.ily +++ b/.lilydrum/musical_functions.ily @@ -5,7 +5,7 @@ eighthBeaming = { \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'( 2 ) + \set beatStructure = #'( 2 2 ) } compoundEighthBeaming = { \set baseMoment = #(ly:make-moment 1/8) diff --git a/airs/my_home/notes.bass.ily b/airs/my_home/notes.bass.ily new file mode 100755 index 0000000..7eb7ef5 --- /dev/null +++ b/airs/my_home/notes.bass.ily @@ -0,0 +1,6 @@ +% 6/8 My Home +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/build_all b/build_all index 9370e5e..1d8b2ac 100755 --- a/build_all +++ b/build_all @@ -4,5 +4,11 @@ MKDRUMCOMMAND="./makedrum" for d in *_marches strathspeys standards jigs airs hornpipes other do - $MKDRUMCOMMAND $d/*.ly + for f in $d/*.ly $d/*/*.ly + do + if [ ! -f $f ] ; then + continue + fi + $MKDRUMCOMMAND $f + done; done; diff --git a/cheatsheet.ly b/cheatsheet.ly index f16c5b4..4f52497 100755 --- a/cheatsheet.ly +++ b/cheatsheet.ly @@ -21,24 +21,22 @@ \include "lilydrum.ly" \score { - \new DrumStaff { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff { \set Staff.instrumentName = "Plain notes" \drummode { - d4 g dcross gcross \rimshot d \rimshot g dback gback + d4 g \crossstick d \crossstick g \rimshot d \rimshot g \backstick d \backstick g } } \addlyrics { - d g dcross gcross "\rimshot d" "\rimshot g" dback gback + "d" "g" "\crossstick d" "\crossstick g" "\rimshot d" "\rimshot g" "\backstick d" "\backstick g" } } \score { - \new DrumStaff { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \new PipeBandDrumStaff { \set Staff.instrumentName = "Tenor Flourishing" \drummode { - d^\splitTheFeather g^\cartWheel d^\up {\scoop d8 g8 d4} g d \flourish { d4 g d g } + d^\splitTheFeather g^\cartWheel d^\up {d8 g8 d4} g d \flourish { d4 g d g } } } \addlyrics { @@ -46,17 +44,58 @@ } } - \score { - \new DrumStaff { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = "Tenor Flourishing" + \new PipeBandDrumStaff { + \set Staff.instrumentName = "Embellishments" + \time 2/4 \drummode { - \partial 8 d8:32( | - \triplet { g16) d g} \flam d16. g32 \drag g16 g16 \triplet { d16 g:64 d->} + \flam d \flam g + \drag d \drag g + \odrag d \odrag g + \ruff d \ruff g + \sruff d \sruff g + } + } + \addlyrics { + "\flam d" "\flam g" + "\drag d" "\drag g" + "\odrag d" "\odrag g" + "\ruff d" "\ruff g" + "\sruff d" "\sruff g" + } +} +\score { + \new PipeBandDrumStaff { + \set Staff.instrumentName = \markup \column { \line{Forced hand} \line{embellishments}} + \time 2/4 + \drummode { + \flamg d \flamd g + \dragg d \dragd g + \odragg d \odragd g + \ruffg d \ruffd g + \sruffg d \sruffd g + } + } + \addlyrics { + "\flamg d" "\flamd g" + "\dragg d" "\dragd g" + "\odragg d" "\odragd g" + "\ruffg d" "\ruffd g" + "\sruffg d" "\sruffd g" + } +} +\score { + \new PipeBandDrumStaff { + \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) + \set Staff.instrumentName = "Rolls" + \drummode { + d4:32( d8:32)(-> g8) \flam d4 r8 d8:32( \dr | + \triplet { g16) d g } \drag d16. g32 d32 g d g d16. g32-> d16. d32 \flam g4 } } \addlyrics { + \partial 8 + "d8:32(" "\\triplet " -- "\\flam d16." "g32" -- "\\drag g16" -- "\\triplet" "g:64" "d-> }" } } diff --git a/cleanpdfs b/cleanpdfs deleted file mode 100755 index c587216..0000000 --- a/cleanpdfs +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Recursively remove all pdfs from this directory -rm -v -R *.pdf -rm -v -R /snare/*.pdf -rm -v -R /tenor/*.pdf -rm -v -R /bass/*.pdf \ No newline at end of file diff --git a/header_default.ily b/header_default.ily index 6d61f1c..e14d07b 100755 --- a/header_default.ily +++ b/header_default.ily @@ -22,9 +22,13 @@ today = #(strftime "%B %e, %Y" (localtime (current-time))) \bold \fromproperty #'header:subtitle } \fromproperty #'header:meter - \column { + \column \right-align { \fromproperty #'header:instrument - \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + \line { + \fromproperty #'header:composer + $(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger)) + (markup " ")) + \italic \fromproperty #'header:arranger } } } $(if (not (ly:get-option 'without-comment)) diff --git a/makedrum b/makedrum index 1e58d77..90479f5 100755 --- a/makedrum +++ b/makedrum @@ -203,7 +203,6 @@ class MakeDrum: if line.startswith(u'\\include'): # Rewrite includes to absolute location of file incline = line.replace('\\include', '').strip('"\' ') - print("include "+incline) if not incline.startswith('\\'): #already absolute incline = os.path.join(os.path.relpath(os.path.dirname(file)), incline) line = "\\include \""+incline+"\"" diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly index aa0797e..6f779cd 100755 --- a/standards/44_standards.side.ly +++ b/standards/44_standards.side.ly @@ -32,6 +32,7 @@ \new PipeBandDrumStaff { \eighthBeaming \time 4/4 + \drummode{ \repeat volta 2{ \partial 8 d16. g32 | \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | @@ -80,8 +81,8 @@ \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 g8 | \flamd d4 d4:32( d4) r8 } - - }% End of drums % + }% End of drums % + } \header { title = "4/4 Standards" From a4c5306daff54b9ed6d60e162870407fc1224dda Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Mon, 30 Nov 2015 22:37:29 +0100 Subject: [PATCH 28/33] Error in last part of Lady MacKenzie of Fairburn for Pipes, added composer & arranger Little update in Readme and Todo --- README.md | 5 +++-- makedrum | 2 +- strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily | 10 +++++----- strathspeys/lady_mackenzie_of_fairburn/notes.side.ily | 10 +++++----- todo | 8 +++++--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ac83937..370e0df 100755 --- a/README.md +++ b/README.md @@ -9,5 +9,6 @@ This is meant to extend or translate some parts. The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970 -Currently, the most advanced score is MacKenzie Highlanders in 2-4_marches/mackenzie_highlanders.side.ly -This score is used for most of the layout. \ No newline at end of file +Currently, the most advanced scores are for Lady MacKenzie of Fairburn in strathspeys/lady_mackenzie_of_fairburn/*.ly +These scores are used for most of the layout. +The scores include a side, tenor, bass, pipes, fullscore for drums and a regular fullscore. \ No newline at end of file diff --git a/makedrum b/makedrum index 90479f5..4dddbf1 100755 --- a/makedrum +++ b/makedrum @@ -10,7 +10,7 @@ from argparse import ArgumentParser class MakeDrum: LILYPOND = 'lilypond' - VERSION = '0.9' + VERSION = '0.9.5' TMP_DIR = './tmp' TMP_PREFIX = 'tmp_' MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily index f41998c..27f092d 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -1,7 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Pipes \version "2.18.2" -composerPipes = "" +composerPipes = "J. Wark, arr. R. Stanley" pipesA = { d16 | \dblc c8. e16 @@ -56,15 +56,15 @@ pipesBB = { \grg a8. \grd c16 \dble d8. d16 \dblc c8. b16 - \grg a8. A16 + \grg a16 A8. | a8. \grd c16 - \grg e8. A16 - \hdblf g8. d16 + \grg e16 A8. + \hdblf g16 d8. \dble e8. c16 | \thrwd d8. e16 \dblg g8. d16 \dblb b8. a16 \grg G8. -} \ No newline at end of file +} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily index 67a647c..95e0700 100755 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -1,7 +1,7 @@ % 4/4 Lady MacKenzie of Fairburn % Side \version "2.18.2" -composerSide = "E.T. de Boone, v0.8, 2015" +composerSide = "E.T. de Boone, v0.9, 2015" snareA = \drummode { \flam d8. g16 d8.:32( g16) @@ -43,10 +43,10 @@ snareBA = \drummode{ d8.[:32(\< \dr g16]:32)(-> \> d8.[:32)( g16]:32)(-> \< d8.[:32)( g16]:32)(-> - d8.) \! + d8.) \! \fr } snareBB = \drummode{ - g16 \fr | + g16 | \triplet {d8 g \flam d} \triplet {g d \flam g} \triplet {d8 g \flam d} @@ -59,11 +59,11 @@ snareBB = \drummode{ | \drag d16 d8 g16 d8.:32( g16) - \flam d8 \< \triplet {d16 g d } + \flamd \triplet { d8 \< g16 g d8 } \flam g4-> \! | d8.[:32( g16]:32)(-> d8.:32)( g16]:32)(-> d8.[:32)( g16]:32)(-> d8.) -} \ No newline at end of file +} diff --git a/todo b/todo index 406409a..e0ff4bc 100755 --- a/todo +++ b/todo @@ -1,9 +1,11 @@ TODO * show 8th and 16th beats in beaming, currently only 8ths: d32[[ g] d[ g]] d32[[ g] d[ g]] * Macro for tutti's (unisons) + - on just one note + - with open ending * Macro for "Part 2 of $n" * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming) - * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. ) + * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. However the flam function doesnt work that way (yet)) * It's customary to have 4 bars per line for portrait and 8 for landscape... * SIDE sticking @@ -11,5 +13,5 @@ TODO * FLOURISHING short long note above-note ups \up arrow-up - scoop \scoop arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one] - (further EUSPBA symbols) \ No newline at end of file + scoop \scoop arrow-right-(diag-up then diag-down) [propably start on beginning of note and filter out the last one] + (further EUSPBA symbols) From 9ce97ffc8b611f5b402115efefd313e3b49555db Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Wed, 9 Dec 2015 19:30:20 +0100 Subject: [PATCH 29/33] Scripts to compile a book from scores --- lybook/bass_book.tex | 22 ++++++ lybook/clean | 2 + lybook/drums_book.tex | 22 ++++++ lybook/full_book.tex | 22 ++++++ lybook/init | 50 ++++++++++++ lybook/load_scores | 34 ++++++++ lybook/makebook | 162 ++++++++++++++++++++++++++++++++++++++ lybook/pipes_book.tex | 22 ++++++ lybook/side_book.tex | 22 ++++++ lybook/tenor_book.tex | 22 ++++++ lybook/tex/main.tex | 100 +++++++++++++++++++++++ lybook/tex/main_bass.tex | 17 ++++ lybook/tex/main_drums.tex | 20 +++++ lybook/tex/main_full.tex | 13 +++ lybook/tex/main_pipes.tex | 14 ++++ lybook/tex/main_side.tex | 58 ++++++++++++++ lybook/tex/main_tenor.tex | 24 ++++++ lybook/tex/score_book.cls | 36 +++++++++ lybook/tex/titlepage.tex | 6 ++ 19 files changed, 668 insertions(+) create mode 100644 lybook/bass_book.tex create mode 100644 lybook/clean create mode 100644 lybook/drums_book.tex create mode 100644 lybook/full_book.tex create mode 100644 lybook/init create mode 100644 lybook/load_scores create mode 100644 lybook/makebook create mode 100644 lybook/pipes_book.tex create mode 100644 lybook/side_book.tex create mode 100644 lybook/tenor_book.tex create mode 100644 lybook/tex/main.tex create mode 100644 lybook/tex/main_bass.tex create mode 100644 lybook/tex/main_drums.tex create mode 100644 lybook/tex/main_full.tex create mode 100644 lybook/tex/main_pipes.tex create mode 100644 lybook/tex/main_side.tex create mode 100644 lybook/tex/main_tenor.tex create mode 100644 lybook/tex/score_book.cls create mode 100644 lybook/tex/titlepage.tex diff --git a/lybook/bass_book.tex b/lybook/bass_book.tex new file mode 100644 index 0000000..52b951d --- /dev/null +++ b/lybook/bass_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Scores Bass} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_bass.tex} +\end{document} diff --git a/lybook/clean b/lybook/clean new file mode 100644 index 0000000..936460e --- /dev/null +++ b/lybook/clean @@ -0,0 +1,2 @@ +#!/bin/sh +rm -v *.log *.aux *.pyc diff --git a/lybook/drums_book.tex b/lybook/drums_book.tex new file mode 100644 index 0000000..5c0a96c --- /dev/null +++ b/lybook/drums_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Drumscores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_drums.tex} +\end{document} diff --git a/lybook/full_book.tex b/lybook/full_book.tex new file mode 100644 index 0000000..6f171bc --- /dev/null +++ b/lybook/full_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Fullscores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_full.tex} +\end{document} diff --git a/lybook/init b/lybook/init new file mode 100644 index 0000000..f467544 --- /dev/null +++ b/lybook/init @@ -0,0 +1,50 @@ +#!/bin/bash + +SHELLCMD='sh' +PYTHONCMD='python3.4' +LATEXCMD='pdflatex' + +#$SHELLCMD load_scores + +#$PYTHONCMD makebook -o tex/main_full.tex full +#$PYTHONCMD makebook -o tex/main_drums.tex drums +#$PYTHONCMD makebook -o tex/main_pipes.tex pipes +#$PYTHONCMD makebook -o tex/main_bass.tex bass +#$PYTHONCMD makebook -o tex/main_tenor.tex tenor +#$PYTHONCMD makebook -o tex/main_side.tex side snare + +for ins in tenor; +do + printf "\\documentclass{tex/score_book} + +\\title{Seaforth Highlanders of Holland\\\\ %s Scores} +\\author{Eric Teunis de Boone} + +\\begin{document} + +\\input{./tex/titlepage.tex} + +\\newpage +\\cleardoublepage +\\phantomsection +\\addcontentsline{toc}{section}{\contentsname} +\\begin{multicols}{2} + \\tableofcontents +\\end{multicols} + +%\\newpage +%\\input{./tex/playlist} +\\newpage +\\input{./tex/main_%s.tex} +\\end{document} +" "$instr" "$instr" +done; + +echo "All setup!" + +read -p "Press [Enter] to compile *.tex" + +for f in ./*.tex; +do + $LATEXCMD $f +done; diff --git a/lybook/load_scores b/lybook/load_scores new file mode 100644 index 0000000..3bf4203 --- /dev/null +++ b/lybook/load_scores @@ -0,0 +1,34 @@ +#!/bin/bash +MKDRUM_DIR="../" +MKDRUMCOMMAND=$MKDRUM_DIR"makedrum" +SCORES_DIR="./scores/" + +trap "echo Aborted!; exit;" SIGINT SIGTERM + +another_dir () { + d=$1 + for f in $d/* + do + if [ -d $f ]; then + another_dir $f + continue + fi + + if [ ! -f $f ]; then + continue + fi + + if [[ ! "$f" == *.ly ]]; then + continue + fi + + mkdir -p $SCORES_DIR${d/$MKDRUM_DIR} + #echo $SCORES_DIR${f/$MKDRUM_DIR} + $MKDRUMCOMMAND $f -d $SCORES_DIR${d/$MKDRUM_DIR} + done; +} + +for d in ${MKDRUM_DIR}*_marches ${MKDRUM_DIR}strathspeys ${MKDRUM_DIR}standards ${MKDRUM_DIR}jigs ${MKDRUM_DIR}airs ${MKDRUM_DIR}hornpipes ${MKDRUM_DIR}other +do + another_dir $d +done; diff --git a/lybook/makebook b/lybook/makebook new file mode 100644 index 0000000..782b56a --- /dev/null +++ b/lybook/makebook @@ -0,0 +1,162 @@ +#!/usr/bin/python3.4 + +# To be Run: python3.4 makebook -v -o ./tex/main_pipes.tex pipes +# Uses a copy of the filestructure of pipeband-drumming to generate the body of a tex file + +import os +from argparse import ArgumentParser + +class MakeBook: + OUT = './tex/main.tex' + MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) + RUN_DIR = os.path.abspath(os.curdir) + SCORES_DIR = './scores/' + LY_DIR = '../' + INSTRUMENTS = ['full','drums', 'pipes', 'bass', 'tenor', 'side','snare'] + def __init__(self): + + usage = __file__ + parser = ArgumentParser(usage) + parser.add_argument('-v','--verbose',default=False,action='store_true',dest='verbose', help='verbose') + parser.add_argument('instrument',default=False,nargs='*',help='Instruments to be included in the book') + parser.add_argument('-o','--output',default=self.OUT,help='Output file') + + self.args = parser.parse_args() + + if self.args.verbose: + self.vprint('Verbose output') + standards = ['standards'] + marches = ['2-4_marches', '3-4_marches', '4-4_marches', '5-4_marches', '6-8_marches'] + watch_folders = [ 'hornpipes', 'jigs', 'strathspeys', 'reels','other'] + watch_folders = marches + watch_folders + + # Run Path_walker over dirs + tune_dirs = [] + for d in watch_folders: + if d in marches: + continue + tune_dirs.append(d) + + # Ready f.out + try: + self.fout = open(self.args.output,'w+') + + self.fwrite(u'\\addcontentsline{toc}{section}{Standards}') + for d in standards: + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=1) + self.fwrite(u'\\addcontentsline{toc}{section}{Marches}') + for d in marches: + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=2) + + for d in tune_dirs: + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d)) + except IOError: + print('Cannot open {}'.format(self.OUT)) + except: + self.fout.close() + raise + + def vprint(self,line): + if self.args.verbose: + print(line) + + def fwrite(self,line): + self.fout.write(line+'\n') + + def include_pdf (self,file, level): + title = False + self.vprint(file) + lilydir = file[:file.rfind('/')].replace(self.SCORES_DIR,self.LY_DIR) + if os.path.isdir(lilydir): + path = file[:file.rfind('/')] + #Try to load title from config file + if os.path.isfile(os.path.join(lilydir,'config.ily')): + self.vprint('Loading config file') + with open(os.path.join(lilydir,'config.ily'),'r') as f: + for line in iter(f): + if line.startswith('title'): + title = line[line.find('=')+1:]#Strip 'title=' + title = title[1:-1] #Strip Quotes + continue + + lilyfile = os.path.join(lilydir, file[file.rfind('-')+1:].replace('.pdf','.ly')) + if not title and os.path.isfile(lilyfile): + self.vprint('Look through lilyfile') + with open(lilyfile, 'r') as f: + for line in iter(f): + if line.strip().startswith('title'): + title = line[line.find('=')+1:]#Strip 'title=' + title = title[1:-1] #Strip Quotes + continue + if title: + ref = title + forbid = ' /!@#$%^&*()<>?\|;:\'"' + for s in forbid: + ref = ref.replace(s,'_') + if not title: + self.vprint('No title yet Found!') + last_slash = file.rfind('/') + last_dot = file.rfind('.') + + if file[file.rfind('.',0,last_dot)+1:file.rfind('.')] in self.INSTRUMENTS: + ref = file[file.rfind('/')+1:file.rfind('.')] + else : + ref = file[file.rfind('/',0,last_slash-1)+1:file.rfind('.')].replace('/','-') + # Make title from filename + title = ref + #Remove references to Instruments + for inst in self.INSTRUMENTS: + title = title.replace('-'+inst, '') + title = title.replace('.'+inst, '') + #Remove chars + title = title.replace('-','').replace('_',' ').title() + + title = title[1:-1].replace('\\n',' ') + + if not self.args.instrument: + for inst in self.INSTRUMENTS: + if inst in file: + title = title + ' ('+inst+')' + self.vprint('= '+title) + ref = 'p'+ref.strip('_').lower() + #string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+','+title+','+ref+'}, pagecommand={}]{'+file+'}' + string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+',{'+title+'},'+ref+'}, pagecommand={}]{'+file+'}' + + self.fwrite(string) + return string + + def path_walker(self, a, level=None, content_line_level=None): + if not a: + return + if level is None: + level = 0 + if content_line_level is None: + content_line_level = 1 + # Do stuff + if level < content_line_level: + self.fwrite(u'\\mysection{'+('sub'*level)+'section}{'+a[a.rfind('/')+1:].replace('_',' ').replace('-','/').title()+'}') + newline = False + for root, dirs, files in os.walk(a,False): + for f in files: + if not f.endswith('.pdf'): + continue + if self.args.instrument: + instr_in_file = False + for instr in self.args.instrument: + if instr in f: + self.vprint(instr) + instr_in_file = True + break + if not instr_in_file: + continue + # Include file + if newline: + self.fwrite(u'\\newpage') + + newline = True + self.include_pdf(os.path.join(root,f), level+1) +# Run above +MakeBook(); diff --git a/lybook/pipes_book.tex b/lybook/pipes_book.tex new file mode 100644 index 0000000..e0d65e6 --- /dev/null +++ b/lybook/pipes_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Pipe Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_pipes.tex} +\end{document} diff --git a/lybook/side_book.tex b/lybook/side_book.tex new file mode 100644 index 0000000..f4fc484 --- /dev/null +++ b/lybook/side_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Side Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_side.tex} +\end{document} diff --git a/lybook/tenor_book.tex b/lybook/tenor_book.tex new file mode 100644 index 0000000..ce5678b --- /dev/null +++ b/lybook/tenor_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Tenor Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_tenor.tex} +\end{document} diff --git a/lybook/tex/main.tex b/lybook/tex/main.tex new file mode 100644 index 0000000..7195c1f --- /dev/null +++ b/lybook/tex/main.tex @@ -0,0 +1,100 @@ +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards (side)},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1 (side)},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2 (side)},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3 (side)},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards (side)},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards (side)},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard (bass)},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards (tenor)},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} +\mysection{subsection}{2/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear (side)},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes (side)},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders (side)},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders (side)},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} +\mysection{subsection}{3/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous (tenor)},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele (side)},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division (side)},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta (side)},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy (side)},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree (side)},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave (side)},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (drums)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (side)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (tenor)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge (tenor)},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (drums)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (side)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (tenor)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings (side)},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (bass)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (drums)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (side)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (tenor)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} +\mysection{subsection}{6/8 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy (side)},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} +\mysection{section}{Hornpipes} +\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers (pipes) (side)},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (drums)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (side)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (tenor)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey (side)},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (bass)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (drums)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (full)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (pipes)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (side)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (tenor)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (bass)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (drums)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (side)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (tenor)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (side)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} +\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers (snare)},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/lybook/tex/main_bass.tex b/lybook/tex/main_bass.tex new file mode 100644 index 0000000..2062be1 --- /dev/null +++ b/lybook/tex/main_bass.tex @@ -0,0 +1,17 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/lybook/tex/main_drums.tex b/lybook/tex/main_drums.tex new file mode 100644 index 0000000..2529961 --- /dev/null +++ b/lybook/tex/main_drums.tex @@ -0,0 +1,20 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/lybook/tex/main_full.tex b/lybook/tex/main_full.tex new file mode 100644 index 0000000..f7b6de8 --- /dev/null +++ b/lybook/tex/main_full.tex @@ -0,0 +1,13 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/lybook/tex/main_pipes.tex b/lybook/tex/main_pipes.tex new file mode 100644 index 0000000..06b3d59 --- /dev/null +++ b/lybook/tex/main_pipes.tex @@ -0,0 +1,14 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/lybook/tex/main_side.tex b/lybook/tex/main_side.tex new file mode 100644 index 0000000..d3a0555 --- /dev/null +++ b/lybook/tex/main_side.tex @@ -0,0 +1,58 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} +\mysection{subsection}{3/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} +\mysection{subsection}{6/8 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} +\mysection{section}{Hornpipes} +\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} +\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/lybook/tex/main_tenor.tex b/lybook/tex/main_tenor.tex new file mode 100644 index 0000000..1e034a4 --- /dev/null +++ b/lybook/tex/main_tenor.tex @@ -0,0 +1,24 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/lybook/tex/score_book.cls b/lybook/tex/score_book.cls new file mode 100644 index 0000000..635ca0e --- /dev/null +++ b/lybook/tex/score_book.cls @@ -0,0 +1,36 @@ +\LoadClass{article} +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{score_book} +% +% Load packages +\RequirePackage[a4paper,margin=1in,landscape]{geometry} +\RequirePackage{pdfpages}%Includepdf +\RequirePackage{amsmath} +\RequirePackage{graphicx} +\RequirePackage{grffile} +\RequirePackage[dutch]{babel} +\RequirePackage{multicol}%Needed for toc +\RequirePackage{bookmark}%Needed for bookmark to toc +\RequirePackage{background} + \backgroundsetup{scale=0.7} + \backgroundsetup{angle=0} + \backgroundsetup{opacity=0.1} + \backgroundsetup{contents={\includegraphics[width=\textheight]{./images/seaforth_capbadge.jpg}}} +\RequirePackage{hyperref} + \hypersetup{colorlinks=false} +\RequirePackage{tocloft} +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{naturalnames}{hyperref} +%\RequirePackage{chngpage} +% +% (Re)Set counters +\setcounter{secnumdepth}{-2}%Hides section no's +% +% Define commands +\newcommand{\mysection}[2]{ + \phantomsection + \stepcounter{#1} + \addtocontents{toc}{\cftpagenumbersoff{#1}}%cft for disabling page numbering + \addcontentsline{toc}{#1}{#2} + \addtocontents{toc}{\cftpagenumberson{#1}}%cft for enabling page numbering +} diff --git a/lybook/tex/titlepage.tex b/lybook/tex/titlepage.tex new file mode 100644 index 0000000..341ac10 --- /dev/null +++ b/lybook/tex/titlepage.tex @@ -0,0 +1,6 @@ +\NoBgThispage +\maketitle +\begin{center} +\includegraphics[width=0.3\textwidth]{./images/SEAFORTH_logo_PMS.pdf} +\end{center} + From 2cbc0c9bd643efe82789e5fbbd9eb363c8d9d7e8 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Fri, 11 Dec 2015 11:25:33 +0100 Subject: [PATCH 30/33] Moved Book scripts around, few edits to music --- .gitignore | 4 +- 4-4_marches/the_pikemans_march/drums.ly | 1 + .../the_pikemans_march/notes.tenor.ily | 12 ++- 4-4_marches/the_pikemans_march/side.ly | 2 +- 4-4_marches/the_pikemans_march/tenor.ly | 1 + airs/alexander_mackenzie/notes.side.ily | 26 +++-- airs/alexander_mackenzie/side.ly | 42 ++++---- book/.gitignore | 7 ++ {lybook => book}/bass_book.tex | 0 {lybook => book}/clean | 0 {lybook => book}/drums_book.tex | 0 {lybook => book}/full_book.tex | 0 {lybook => book}/init | 14 +-- {lybook => book}/load_scores | 0 {lybook => book}/makebook | 56 ++++++---- {lybook => book}/pipes_book.tex | 0 {lybook => book}/side_book.tex | 0 {lybook => book}/tenor_book.tex | 0 {lybook => book}/tex/main_bass.tex | 0 {lybook => book}/tex/main_drums.tex | 0 {lybook => book}/tex/main_full.tex | 0 {lybook => book}/tex/main_pipes.tex | 0 {lybook => book}/tex/main_side.tex | 0 {lybook => book}/tex/main_tenor.tex | 0 {lybook => book}/tex/score_book.cls | 0 {lybook => book}/tex/titlepage.tex | 0 lybook/tex/main.tex | 100 ------------------ makedrum | 89 ++++++++++------ strathspeys/molly_connell/notes.side.v1.1.ily | 18 ++-- 29 files changed, 170 insertions(+), 202 deletions(-) create mode 100644 book/.gitignore rename {lybook => book}/bass_book.tex (100%) rename {lybook => book}/clean (100%) rename {lybook => book}/drums_book.tex (100%) rename {lybook => book}/full_book.tex (100%) rename {lybook => book}/init (81%) rename {lybook => book}/load_scores (100%) rename {lybook => book}/makebook (82%) rename {lybook => book}/pipes_book.tex (100%) rename {lybook => book}/side_book.tex (100%) rename {lybook => book}/tenor_book.tex (100%) rename {lybook => book}/tex/main_bass.tex (100%) rename {lybook => book}/tex/main_drums.tex (100%) rename {lybook => book}/tex/main_full.tex (100%) rename {lybook => book}/tex/main_pipes.tex (100%) rename {lybook => book}/tex/main_side.tex (100%) rename {lybook => book}/tex/main_tenor.tex (100%) rename {lybook => book}/tex/score_book.cls (100%) rename {lybook => book}/tex/titlepage.tex (100%) delete mode 100644 lybook/tex/main.tex diff --git a/.gitignore b/.gitignore index bd55f6c..9c0039b 100755 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ -.gitignore *.ps *.pdf *.png *.log *tmp* *.py +*.toc +*.aux _output/ pdf/ -fullscores/ fullscores/* diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly index de9beec..a68bdc2 100755 --- a/4-4_marches/the_pikemans_march/drums.ly +++ b/4-4_marches/the_pikemans_march/drums.ly @@ -43,6 +43,7 @@ \tenorAB s8 + s8 \tenorBA \tenorBB \tenorBC diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily index 5473491..628086f 100755 --- a/4-4_marches/the_pikemans_march/notes.tenor.ily +++ b/4-4_marches/the_pikemans_march/notes.tenor.ily @@ -1,7 +1,7 @@ % 4/4 The Pikeman's March % Tenor \version "2.18.2" -composerTenor = "E.T. de Boone, 2015" +composerTenor = "E.T. de Boone, v0.3, 2015" %%music tenorAA = \drummode { @@ -26,8 +26,16 @@ tenorAB = \drummode { } % Part 2 tenorBA = \drummode { + d8-_ g + d8 g + d8 g + d8 g + | + s1*3 } tenorBB = \drummode { + s1*4 } tenorBC = \drummode { -} \ No newline at end of file + s1*4 +} diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly index 995938f..6aac954 100755 --- a/4-4_marches/the_pikemans_march/side.ly +++ b/4-4_marches/the_pikemans_march/side.ly @@ -1,7 +1,7 @@ \version "2.18.2" \include "config.ily" -\include "notes.side.v1.5.ily" +\include "notes.side.v1.6.ily" \score { \new PipeBandDrumStaff { diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly index 9be85a5..86e7e61 100755 --- a/4-4_marches/the_pikemans_march/tenor.ly +++ b/4-4_marches/the_pikemans_march/tenor.ly @@ -16,6 +16,7 @@ \tenorAA \tenorAB + s8 \tenorBA \tenorBB \tenorBC diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily index dfb6475..0df83a0 100755 --- a/airs/alexander_mackenzie/notes.side.ily +++ b/airs/alexander_mackenzie/notes.side.ily @@ -2,27 +2,35 @@ % Side \version "2.18.2" composerSide = "" -snareA = \drummode { +snareAA = \drummode { d16. g32 | d8:32( d8.)-> g16 d4:32( d8) | \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 d16. g32 | + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 +} +snareAB = \drummode { + d16. g32 | d8:32( d8.)-> g16 d4:32( d8) | \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | d4.:32( d4) } snareBA = \drummode { d8:32( | - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( | - g4) \flamd d16. g32 d8:32( g8.) g16 | - d4.:32( d4) d8:32( | + g4) \flamd d16. g32 d8:32( d8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( - g4) \flamd d16. g32 d8:32( g8) \flamd d8 | + g4) \flamd d16. g32 d8:32( d8.) g16 | + d4.:32( d4) +} +snareBB = \drummode { + d8:32( | + g4) \flamd d16. g32 d8:32( d8) \flamd d8 | d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | d4.:32( d4) -} \ No newline at end of file +} diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly index 7f7d71a..bfabc04 100755 --- a/airs/alexander_mackenzie/side.ly +++ b/airs/alexander_mackenzie/side.ly @@ -6,24 +6,26 @@ \score { \new PipeBandDrumStaff { \global - << - { - \repeat volta 2 { \part \line \break } \break - \part \line \bar "||" \break - \part \line \bar "|." - } - { - \snareA s8 + << + { + \repeat volta 2 { \part \line \break } \break + \repeat volta 2 { \part \halfline \break } + \alternative{ {\part \halfline \break}{\part \halfline \break} } + \bar "|." + } + { + \snareAA \snareAB s8 - \snareBA s8 - \snareA s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file + \snareBA s8 + \snareBB s8 + \snareAB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} diff --git a/book/.gitignore b/book/.gitignore new file mode 100644 index 0000000..86753b4 --- /dev/null +++ b/book/.gitignore @@ -0,0 +1,7 @@ +*.pdf +*.aux +*.log +*.toc +images/* +scores/* +tmp/* diff --git a/lybook/bass_book.tex b/book/bass_book.tex similarity index 100% rename from lybook/bass_book.tex rename to book/bass_book.tex diff --git a/lybook/clean b/book/clean similarity index 100% rename from lybook/clean rename to book/clean diff --git a/lybook/drums_book.tex b/book/drums_book.tex similarity index 100% rename from lybook/drums_book.tex rename to book/drums_book.tex diff --git a/lybook/full_book.tex b/book/full_book.tex similarity index 100% rename from lybook/full_book.tex rename to book/full_book.tex diff --git a/lybook/init b/book/init similarity index 81% rename from lybook/init rename to book/init index f467544..4e9ffc9 100644 --- a/lybook/init +++ b/book/init @@ -17,8 +17,8 @@ for ins in tenor; do printf "\\documentclass{tex/score_book} -\\title{Seaforth Highlanders of Holland\\\\ %s Scores} -\\author{Eric Teunis de Boone} + \\title{Seaforth Highlanders of Holland\\\\ %s Scores} + \\author{Eric Teunis de Boone} \\begin{document} @@ -42,9 +42,9 @@ done; echo "All setup!" -read -p "Press [Enter] to compile *.tex" +#read -p "Press [Enter] to compile *.tex" -for f in ./*.tex; -do - $LATEXCMD $f -done; +#for f in ./*.tex; +#do +# $LATEXCMD $f +#done; diff --git a/lybook/load_scores b/book/load_scores similarity index 100% rename from lybook/load_scores rename to book/load_scores diff --git a/lybook/makebook b/book/makebook similarity index 82% rename from lybook/makebook rename to book/makebook index 782b56a..5c8747b 100644 --- a/lybook/makebook +++ b/book/makebook @@ -12,6 +12,7 @@ class MakeBook: RUN_DIR = os.path.abspath(os.curdir) SCORES_DIR = './scores/' LY_DIR = '../' + ORDER_FILE = 'order.txt' INSTRUMENTS = ['full','drums', 'pipes', 'bass', 'tenor', 'side','snare'] def __init__(self): @@ -43,14 +44,17 @@ class MakeBook: self.fwrite(u'\\addcontentsline{toc}{section}{Standards}') for d in standards: + self.vprint() self.vprint(os.path.join(self.SCORES_DIR,d)) self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=1) self.fwrite(u'\\addcontentsline{toc}{section}{Marches}') for d in marches: + self.vprint() self.vprint(os.path.join(self.SCORES_DIR,d)) self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=2) for d in tune_dirs: + self.vprint() self.vprint(os.path.join(self.SCORES_DIR,d)) self.path_walker(os.path.join(self.SCORES_DIR,d)) except IOError: @@ -59,8 +63,10 @@ class MakeBook: self.fout.close() raise - def vprint(self,line): + def vprint(self,line = None): if self.args.verbose: + if line is None: + line = '' print(line) def fwrite(self,line): @@ -139,24 +145,36 @@ class MakeBook: if level < content_line_level: self.fwrite(u'\\mysection{'+('sub'*level)+'section}{'+a[a.rfind('/')+1:].replace('_',' ').replace('-','/').title()+'}') newline = False - for root, dirs, files in os.walk(a,False): - for f in files: - if not f.endswith('.pdf'): - continue - if self.args.instrument: - instr_in_file = False - for instr in self.args.instrument: - if instr in f: - self.vprint(instr) - instr_in_file = True - break - if not instr_in_file: - continue - # Include file - if newline: - self.fwrite(u'\\newpage') - newline = True - self.include_pdf(os.path.join(root,f), level+1) + if os.path.isfile(os.path.join(a, 'order.txt')): + self.vprint('Found order') + with open(os.path.join(a, self.ORDER_FILE)) as f: + line = f.readline().rstrip('\n') + while line: + self.path_walker(os.path.join(a,line), level+1) + line = f.readline().rstrip('\n') + else: + for root, dirs, files in os.walk(a,False): + for f in files: + if not f.endswith('.pdf'): + self.vprint('F! '+f) + continue + if self.args.instrument: + instr_in_file = False + for instr in self.args.instrument: + if instr in f: + self.vprint(instr) + instr_in_file = True + break + if not instr_in_file: + self.vprint('F! '+f) + continue + # Include file + self.vprint('F '+f) + if newline: + self.fwrite(u'\\newpage') + + newline = True + self.include_pdf(os.path.join(root,f), level+1) # Run above MakeBook(); diff --git a/lybook/pipes_book.tex b/book/pipes_book.tex similarity index 100% rename from lybook/pipes_book.tex rename to book/pipes_book.tex diff --git a/lybook/side_book.tex b/book/side_book.tex similarity index 100% rename from lybook/side_book.tex rename to book/side_book.tex diff --git a/lybook/tenor_book.tex b/book/tenor_book.tex similarity index 100% rename from lybook/tenor_book.tex rename to book/tenor_book.tex diff --git a/lybook/tex/main_bass.tex b/book/tex/main_bass.tex similarity index 100% rename from lybook/tex/main_bass.tex rename to book/tex/main_bass.tex diff --git a/lybook/tex/main_drums.tex b/book/tex/main_drums.tex similarity index 100% rename from lybook/tex/main_drums.tex rename to book/tex/main_drums.tex diff --git a/lybook/tex/main_full.tex b/book/tex/main_full.tex similarity index 100% rename from lybook/tex/main_full.tex rename to book/tex/main_full.tex diff --git a/lybook/tex/main_pipes.tex b/book/tex/main_pipes.tex similarity index 100% rename from lybook/tex/main_pipes.tex rename to book/tex/main_pipes.tex diff --git a/lybook/tex/main_side.tex b/book/tex/main_side.tex similarity index 100% rename from lybook/tex/main_side.tex rename to book/tex/main_side.tex diff --git a/lybook/tex/main_tenor.tex b/book/tex/main_tenor.tex similarity index 100% rename from lybook/tex/main_tenor.tex rename to book/tex/main_tenor.tex diff --git a/lybook/tex/score_book.cls b/book/tex/score_book.cls similarity index 100% rename from lybook/tex/score_book.cls rename to book/tex/score_book.cls diff --git a/lybook/tex/titlepage.tex b/book/tex/titlepage.tex similarity index 100% rename from lybook/tex/titlepage.tex rename to book/tex/titlepage.tex diff --git a/lybook/tex/main.tex b/lybook/tex/main.tex deleted file mode 100644 index 7195c1f..0000000 --- a/lybook/tex/main.tex +++ /dev/null @@ -1,100 +0,0 @@ -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards (side)},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1 (side)},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2 (side)},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3 (side)},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards (side)},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards (side)},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard (bass)},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards (tenor)},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} -\mysection{subsection}{2/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear (side)},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes (side)},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders (side)},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders (side)},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} -\mysection{subsection}{3/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous (tenor)},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele (side)},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division (side)},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta (side)},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy (side)},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree (side)},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave (side)},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (drums)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (side)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool (tenor)},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge (tenor)},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (drums)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (side)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March (tenor)},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings (side)},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (bass)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (drums)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (side)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay (tenor)},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} -\mysection{subsection}{6/8 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy (side)},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} -\mysection{section}{Hornpipes} -\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers (pipes) (side)},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (drums)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (side)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks (tenor)},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey (side)},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (bass)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (drums)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (full)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (pipes)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (side)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn (tenor)},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (bass)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (drums)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (side)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (tenor)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell (side)},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} -\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers (snare)},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/makedrum b/makedrum index 4dddbf1..7458a22 100755 --- a/makedrum +++ b/makedrum @@ -51,6 +51,12 @@ class MakeDrum: action='store_true', dest='view_spacing', default=False, help='Turn on "Paper.annotatespacing".') + parser.add_argument('-g','--generated', + dest='gen_out', default=self.TMP_DIR, + help='Put generated lilyfiles in $gen_out') + parser.add_argument('--no-compile', default=True, + action='store_false', dest='compile', + help='Do not compile generated Lilypond files') parser.add_argument('--no-log', action='store_false', dest='log', default=True, help='Do not generate log files.') @@ -61,7 +67,7 @@ class MakeDrum: dest='out_dir', default='pdf', help='Output dir, for lilypond. If it doesn\'t exist, try to create it') parser.add_argument('music_file', - default='', nargs='+', + default='', nargs='*', help='file to process') parser.add_argument('-@', '--list_file', dest='list_file', default='', @@ -86,6 +92,11 @@ class MakeDrum: if self.args.list_file != '': self.args.music_file.append(open(self.args.list_file, 'r').readlines()) close(self.args.list_file) + # Check for files + if not self.args.music_file: + parser.print_usage() + return + # Clean up of files self.remove_tmp_dir = self.args.clean @@ -103,20 +114,14 @@ class MakeDrum: os.chdir(self.MASTER_DIR) for file_path in self.args.music_file: - self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path)) + self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path), self.args.gen_out, self.args.compile) #if not #os.rmdir(self.TMP_DIR) os.chdir(self.RUN_DIR) - def processit(self, tmp_dir, file): - if self.args.log: - logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).replace(".ly", '').replace('/', '-')+'.log') - log = ' > '+logfile+' 2>&1' - else: - log = '' - + def processit(self, tmp_dir, file, gen_out, compile): if self.args.format is None: if file.endswith(".book"): header_format = "header_book" @@ -127,27 +132,49 @@ class MakeDrum: tmp_file = self.maketemplate(tmp_dir, file, header_format) - print ('Compiling ', file, end=' ', flush=True) - if not self.args.log: - print() + if gen_out is not None and gen_out != tmp_dir: + new_tmp_file = os.path.basename(tmp_file).replace(self.TMP_PREFIX, ''); + print ('Moving ', tmp_file, ' to ', new_tmp_file, end=' ', flush=True) + gen_dir = os.path.join(self.RUN_DIR, gen_out); + # if not dir $gen_out, make it + if not os.path.exists(gen_dir): + try: os.makedirs(gen_dir) + except: + print('[Error]') + print(' ! Seems like the {} directory cannot be created'.format(gen_dir)) + return + # mv file to dir, remove self.TMP_PREFIX + os.rename(tmp_file, os.path.join(gen_dir, new_tmp_file)) + tmp_file = new_tmp_file + print('[OK]') - lilyout = os.path.join(os.path.curdir, self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", '')) - lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log - - if os.system(lilycmd) != 0: - self.remove_tmp_dir = False - print ('[Error]') + if compile: if self.args.log: - print (' ! Did not compile, please see the log at ', logfile) - else : - print ('[OK]') + logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).replace(".ly", '').replace('/', '-')+'.log') + log = ' > '+logfile+' 2>&1' + else: + log = '' - if self.args.clean: - #remove files + print ('Compiling ', file, end=' ', flush=True) + if not self.args.log: + print() + lilyout = os.path.join(self.RUN_DIR, self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", '')) + print (lilyout) + lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log + + if os.system(lilycmd) != 0: + self.remove_tmp_dir = False + print ('[Error]') if self.args.log: - os.remove(logfile) - os.remove(tmp_file) - + print (' ! Did not compile, please see the log at ', logfile) + else : + print ('[OK]') + + if self.args.clean: + #remove files + if self.args.log: + os.remove(logfile) + os.remove(tmp_file) def maketemplate(self, tmp_dir, file, header_format): lily_includes = '' @@ -157,11 +184,9 @@ class MakeDrum: for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: if ext in file: include_drum_file = True - for ext in ['full', 'pipes']: if ext in file: include_pipe_file = True - if include_drum_file: lily_includes = lily_includes + u""" \\include \""""+self.args.lilydrum+"""\" @@ -178,14 +203,14 @@ class MakeDrum: out_file.write(u'\ufeff') out_file.write(u""" -% Generated from """+file+""" by """+__file__+""" +% Generated from """+file+""" by """+__file__+""" version """+self.VERSION+""" \\version "2.18.0" #(ly:set-option 'point-and-click #f) """+ lily_includes +""" -\\include \""""+header_format+""".ily" +\\include \""""+os.path.join(os.path.abspath(self.MASTER_DIR), header_format.strip(".ily")+""".ily""")+"""\" #(set-global-staff-size """+self.args.staffsize+""") #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") @@ -204,7 +229,7 @@ class MakeDrum: # Rewrite includes to absolute location of file incline = line.replace('\\include', '').strip('"\' ') if not incline.startswith('\\'): #already absolute - incline = os.path.join(os.path.relpath(os.path.dirname(file)), incline) + incline = os.path.join(os.path.abspath(os.path.dirname(file)), incline) line = "\\include \""+incline+"\"" if printit: out_file.write(line.replace('\r', '')+'\n') @@ -212,6 +237,4 @@ class MakeDrum: # Return tmp_file_path return tmp_file - - MakeDrum(); diff --git a/strathspeys/molly_connell/notes.side.v1.1.ily b/strathspeys/molly_connell/notes.side.v1.1.ily index 6466955..ff78686 100755 --- a/strathspeys/molly_connell/notes.side.v1.1.ily +++ b/strathspeys/molly_connell/notes.side.v1.1.ily @@ -4,25 +4,25 @@ composerSide = "v1.1, 2015" snareA = \drummode { \flamddr d4 \flam g8.[\fr d16:64(] d8.[) \dragddr d16] d8.[ \fr g16] | - d8.:64[(-> g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] \dr | + d8.:64[(-> g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flamddr g8] } \flam d8.[ \fr g16] | - d16:64[( d8.]) \fr g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] \dr| - \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 \fr + d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \flamddr \triplet { d8 \fr g d } \flamddr g8.[ \flam g16] \triplet { d16 g d g d8 } g8 \fr } snareBA = \drummode { \partial 8 g8 \dr | d4:32( d8.[) \drag d16] \fr \triplet { d16[ g d g d8] } g8.[ g16] \dr | - \drag d16[ d8.] \flam d8.[ \flam g16] \fr \triplet { d16[ g d g d8] } \triplet { g8[ d g] \dr } | + \drag d16[ d8.] \flam d8.[ \flam g16] \fr \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | - \flamd \triplet { d8[ \fr g16 g16 d8] } g8.[ g16]\dr \flamd \triplet { d8[->\fr g16 g16 d8] } g8.[ g16] \dr | - \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 \fr | + \flamddr \triplet { d8[ \fr g16 g16 d8] } g8.[ g16] \flamddr \triplet { d8[\fr g16 g16 d8] } g8.[ g16] | + \flamddr \triplet { d8[ \fr g d] } \flamddr g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 \fr | } snareBB = \drummode { \partial 8 g8 | d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[\> d g] } | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[\> d g]\! } | - \flam d4 \flam g8.[\! d16:64]( d8.[) \drag d16] d8.[ g16] | + \flam d4 \flam g8.[ d16:64]( d8.[) \drag d16] d8.[ g16] | \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 | -} \ No newline at end of file +} From c6a9c956321a175e33e1668cea8e8e3e19cb7a0e Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Fri, 18 Dec 2015 13:03:14 +0100 Subject: [PATCH 31/33] Decided to put all the music files in a separate git Added file inclusion in favor of 'header_*' file inclusion --- .gitignore | 12 +- 2-4_marches/black_bear/config.ily | 14 -- 2-4_marches/black_bear/notes.side.ily | 31 --- 2-4_marches/black_bear/notes.side.v1.2.ily | 33 ---- 2-4_marches/black_bear/notes.side.v1.3.ily | 33 ---- 2-4_marches/black_bear/side.ly | 27 --- 2-4_marches/duncan_mcinness/config.ily | 15 -- 2-4_marches/duncan_mcinness/notes.side.ily | 83 -------- 2-4_marches/duncan_mcinness/side.ly | 32 ---- 2-4_marches/mackenzie_highlanders/config.ily | 21 -- .../mackenzie_highlanders/notes.side.alt.ily | 48 ----- .../mackenzie_highlanders/notes.side.ily | 36 ---- 2-4_marches/mackenzie_highlanders/side.alt.ly | 28 --- 2-4_marches/mackenzie_highlanders/side.ly | 26 --- 3-4_marches/castle_dangerous/config.ily | 20 -- 3-4_marches/castle_dangerous/notes.tenor.ily | 24 --- 3-4_marches/castle_dangerous/tenor.ly | 24 --- .../on_the_road_to_passchendaele/config.ily | 20 -- .../notes.side.ily | 35 ---- .../on_the_road_to_passchendaele/side.ly | 33 ---- 4-4_marches/51st_highland_division/config.ily | 19 -- .../51st_highland_division/notes.side.ily | 29 --- 4-4_marches/51st_highland_division/side.ly | 35 ---- 4-4_marches/flett_from_flotta/config.ily | 21 -- 4-4_marches/flett_from_flotta/notes.side.ily | 29 --- 4-4_marches/flett_from_flotta/side.ly | 28 --- 4-4_marches/minstrel_boy/config.ily | 20 -- 4-4_marches/minstrel_boy/notes.side.ily | 33 ---- 4-4_marches/minstrel_boy/side.ly | 33 ---- 4-4_marches/rowan_tree/config.ily | 21 -- 4-4_marches/rowan_tree/notes.side.ily | 23 --- 4-4_marches/rowan_tree/side.ly | 27 --- 4-4_marches/scotland_the_brave/config.ily | 21 -- 4-4_marches/scotland_the_brave/notes.side.ily | 21 -- 4-4_marches/scotland_the_brave/side.ly | 27 --- .../the_leaving_of_liverpool/config.ily | 15 -- 4-4_marches/the_leaving_of_liverpool/drums.ly | 63 ------ .../the_leaving_of_liverpool/notes.side.ily | 33 ---- .../the_leaving_of_liverpool/notes.tenor.ily | 27 --- 4-4_marches/the_leaving_of_liverpool/side.ly | 30 --- 4-4_marches/the_leaving_of_liverpool/tenor.ly | 20 -- 4-4_marches/the_old_rustic_bridge/config.ily | 21 -- .../the_old_rustic_bridge/notes.tenor.ily | 13 -- 4-4_marches/the_old_rustic_bridge/tenor.ly | 20 -- 4-4_marches/the_pikemans_march/config.ily | 19 -- 4-4_marches/the_pikemans_march/drums.ly | 68 ------- 4-4_marches/the_pikemans_march/notes.side.ily | 39 ---- .../the_pikemans_march/notes.side.v1.5.ily | 39 ---- .../the_pikemans_march/notes.side.v1.6.ily | 39 ---- .../the_pikemans_march/notes.tenor.ily | 41 ---- 4-4_marches/the_pikemans_march/side.ly | 32 ---- 4-4_marches/the_pikemans_march/tenor.ly | 32 ---- .../were_no_awa_tae_bide_awa/config.ily | 15 -- .../were_no_awa_tae_bide_awa/notes.side.ily | 19 -- 4-4_marches/were_no_awa_tae_bide_awa/side.ly | 26 --- 4-4_marches/wings/config.ily | 14 -- 4-4_marches/wings/notes.side.ily | 28 --- 4-4_marches/wings/side.ly | 39 ---- 5-4_marches/cullen_bay/bass.ly | 20 -- 5-4_marches/cullen_bay/config.ily | 13 -- 5-4_marches/cullen_bay/drums.ly | 65 ------- 5-4_marches/cullen_bay/notes.bass.ily | 7 - 5-4_marches/cullen_bay/notes.side.ily | 62 ------ 5-4_marches/cullen_bay/notes.tenor.ily | 16 -- 5-4_marches/cullen_bay/side.ly | 30 --- 5-4_marches/cullen_bay/tenor.ly | 20 -- 6-8_marches/hills_of_glenorchy/config.ily | 14 -- 6-8_marches/hills_of_glenorchy/notes.side.ily | 33 ---- 6-8_marches/hills_of_glenorchy/side.ly | 26 --- airs/abide_with_me/config.ily | 14 -- airs/abide_with_me/notes.side.ily | 16 -- airs/abide_with_me/side.ly | 31 --- airs/alexander_mackenzie/config.ily | 14 -- airs/alexander_mackenzie/notes.side.ily | 36 ---- airs/alexander_mackenzie/side.ly | 31 --- airs/amazing_grace/config.ily | 14 -- airs/amazing_grace/notes.side.ily | 31 --- airs/amazing_grace/side.ly | 34 ---- airs/farewell_to_camraw/config.ily | 13 -- airs/farewell_to_camraw/drums.ly | 50 ----- airs/farewell_to_camraw/notes.side.ily | 14 -- airs/farewell_to_camraw/notes.tenor.ily | 15 -- airs/farewell_to_camraw/side.ly | 20 -- airs/farewell_to_camraw/tenor.ly | 20 -- airs/flower_of_scotland/config.ily | 14 -- airs/flower_of_scotland/notes.side.ily | 26 --- airs/flower_of_scotland/side.ly | 24 --- airs/loch_duich/config.ily | 14 -- airs/loch_duich/notes.side.ily | 46 ----- airs/loch_duich/side.ly | 33 ---- airs/miss_kirkwood/config.ily | 14 -- airs/miss_kirkwood/notes.side.ily | 25 --- airs/miss_kirkwood/side.ly | 26 --- airs/morag_of_dunvegan/bass.ly | 20 -- airs/morag_of_dunvegan/config.ily | 18 -- airs/morag_of_dunvegan/drums.ly | 51 ----- airs/morag_of_dunvegan/notes.bass.ily | 23 --- airs/morag_of_dunvegan/notes.side.ily | 30 --- airs/morag_of_dunvegan/notes.tenor.ily | 29 --- airs/morag_of_dunvegan/side.ly | 20 -- airs/morag_of_dunvegan/tenor.ly | 20 -- airs/my_home/config.ily | 14 -- airs/my_home/drums.ly | 54 ------ airs/my_home/notes.bass.ily | 6 - airs/my_home/notes.side.ily | 26 --- airs/my_home/notes.tenor.ily | 15 -- airs/my_home/side.ly | 26 --- airs/my_home/tenor.ly | 26 --- airs/the_mist_covered_mountains/config.ily | 19 -- airs/the_mist_covered_mountains/drums.ly | 51 ----- .../the_mist_covered_mountains/notes.side.ily | 23 --- .../notes.tenor.ily | 25 --- airs/the_mist_covered_mountains/side.ly | 20 -- airs/the_mist_covered_mountains/tenor.ly | 20 -- book/.gitignore | 7 - book/bass_book.tex | 22 --- book/clean | 2 - book/drums_book.tex | 22 --- book/full_book.tex | 22 --- book/init | 50 ----- book/load_scores | 34 ---- book/makebook | 180 ------------------ book/pipes_book.tex | 22 --- book/side_book.tex | 22 --- book/tenor_book.tex | 22 --- book/tex/main_bass.tex | 17 -- book/tex/main_drums.tex | 20 -- book/tex/main_full.tex | 13 -- book/tex/main_pipes.tex | 14 -- book/tex/main_side.tex | 58 ------ book/tex/main_tenor.tex | 24 --- book/tex/score_book.cls | 36 ---- book/tex/titlepage.tex | 6 - build_all | 14 -- cheatsheet.ly | 23 ++- example.ly | 24 --- header_book.ily | 42 ---- header_default.ily | 39 ---- hornpipes/itchy_fingers/config.ily | 15 -- hornpipes/itchy_fingers/notes.side.ily | 35 ---- hornpipes/itchy_fingers/side.ly | 27 --- jigs/seaforth_sticks/config.ily | 14 -- jigs/seaforth_sticks/drums.ly | 65 ------- jigs/seaforth_sticks/notes.bass.ily | 6 - jigs/seaforth_sticks/notes.side.ily | 123 ------------ jigs/seaforth_sticks/notes.tenor.ily | 6 - jigs/seaforth_sticks/side.ly | 38 ---- jigs/seaforth_sticks/tenor.ly | 29 --- lilydrum.ly | 10 +- {.lilydrum => lilydrum}/embellishments.ily | 0 .../flourish_symbols/butterfly.eps | 0 .../flourish_symbols/st_andrews_crss.eps | 0 .../flourish_symbols/stop.eps | 0 {.lilydrum => lilydrum}/flourishing.ily | 0 {.lilydrum => lilydrum}/layout_tweaks.ily | 0 {.lilydrum => lilydrum}/musical_functions.ily | 0 {.lilydrum => lilydrum}/special_sticking.ily | 0 makedrum | 45 +++-- other/band_of_brothers.snare.ly | 128 ------------- standards/24_standards.side.ly | 73 ------- standards/34_standards1.side.ly | 64 ------- standards/34_standards2.side.ly | 61 ------ standards/34_standards3.side.ly | 65 ------- standards/44_standards.side.ly | 93 --------- standards/68_standards.side.ly | 90 --------- standards/standards.bass.ly | 64 ------- standards/standards.tenor.ly | 132 ------------- strathspeys/aa_camerons/config.ily | 14 -- strathspeys/aa_camerons/notes.side.ily | 30 --- strathspeys/aa_camerons/side.ly | 39 ---- .../lady_mackenzie_of_fairburn/bass.ly | 20 -- .../lady_mackenzie_of_fairburn/config.ily | 13 -- .../lady_mackenzie_of_fairburn/drums.ly | 51 ----- .../lady_mackenzie_of_fairburn/full.ly | 64 ------- .../lady_mackenzie_of_fairburn/notes.bass.ily | 25 --- .../notes.pipes.ily | 70 ------- .../lady_mackenzie_of_fairburn/notes.side.ily | 69 ------- .../notes.tenor.ily | 56 ------ .../lady_mackenzie_of_fairburn/pipes.ly | 21 -- .../lady_mackenzie_of_fairburn/side.ly | 20 -- .../lady_mackenzie_of_fairburn/tenor.ly | 20 -- strathspeys/molly_connell/bass.ly | 20 -- strathspeys/molly_connell/config.ily | 13 -- strathspeys/molly_connell/drums.ly | 78 -------- strathspeys/molly_connell/notes.bass.ily | 16 -- strathspeys/molly_connell/notes.side.ily | 28 --- strathspeys/molly_connell/notes.side.v1.1.ily | 28 --- strathspeys/molly_connell/notes.tenor.ily | 22 --- strathspeys/molly_connell/side.ly | 20 -- strathspeys/molly_connell/tenor.ly | 20 -- template/config.ily | 14 -- template/drums.ly | 47 ----- template/full.ly | 55 ------ template/notes.bass.ily | 6 - template/notes.pipes.ily | 6 - template/notes.side.ily | 6 - template/notes.tenor.ily | 6 - template/pipes.ly | 21 -- template/side.ly | 20 -- template/tenor.ly | 20 -- 200 files changed, 54 insertions(+), 5913 deletions(-) delete mode 100755 2-4_marches/black_bear/config.ily delete mode 100755 2-4_marches/black_bear/notes.side.ily delete mode 100755 2-4_marches/black_bear/notes.side.v1.2.ily delete mode 100755 2-4_marches/black_bear/notes.side.v1.3.ily delete mode 100755 2-4_marches/black_bear/side.ly delete mode 100755 2-4_marches/duncan_mcinness/config.ily delete mode 100755 2-4_marches/duncan_mcinness/notes.side.ily delete mode 100755 2-4_marches/duncan_mcinness/side.ly delete mode 100755 2-4_marches/mackenzie_highlanders/config.ily delete mode 100755 2-4_marches/mackenzie_highlanders/notes.side.alt.ily delete mode 100755 2-4_marches/mackenzie_highlanders/notes.side.ily delete mode 100755 2-4_marches/mackenzie_highlanders/side.alt.ly delete mode 100755 2-4_marches/mackenzie_highlanders/side.ly delete mode 100755 3-4_marches/castle_dangerous/config.ily delete mode 100755 3-4_marches/castle_dangerous/notes.tenor.ily delete mode 100755 3-4_marches/castle_dangerous/tenor.ly delete mode 100755 3-4_marches/on_the_road_to_passchendaele/config.ily delete mode 100755 3-4_marches/on_the_road_to_passchendaele/notes.side.ily delete mode 100755 3-4_marches/on_the_road_to_passchendaele/side.ly delete mode 100755 4-4_marches/51st_highland_division/config.ily delete mode 100755 4-4_marches/51st_highland_division/notes.side.ily delete mode 100755 4-4_marches/51st_highland_division/side.ly delete mode 100755 4-4_marches/flett_from_flotta/config.ily delete mode 100755 4-4_marches/flett_from_flotta/notes.side.ily delete mode 100755 4-4_marches/flett_from_flotta/side.ly delete mode 100755 4-4_marches/minstrel_boy/config.ily delete mode 100755 4-4_marches/minstrel_boy/notes.side.ily delete mode 100755 4-4_marches/minstrel_boy/side.ly delete mode 100755 4-4_marches/rowan_tree/config.ily delete mode 100755 4-4_marches/rowan_tree/notes.side.ily delete mode 100755 4-4_marches/rowan_tree/side.ly delete mode 100755 4-4_marches/scotland_the_brave/config.ily delete mode 100755 4-4_marches/scotland_the_brave/notes.side.ily delete mode 100755 4-4_marches/scotland_the_brave/side.ly delete mode 100755 4-4_marches/the_leaving_of_liverpool/config.ily delete mode 100755 4-4_marches/the_leaving_of_liverpool/drums.ly delete mode 100755 4-4_marches/the_leaving_of_liverpool/notes.side.ily delete mode 100755 4-4_marches/the_leaving_of_liverpool/notes.tenor.ily delete mode 100755 4-4_marches/the_leaving_of_liverpool/side.ly delete mode 100755 4-4_marches/the_leaving_of_liverpool/tenor.ly delete mode 100755 4-4_marches/the_old_rustic_bridge/config.ily delete mode 100755 4-4_marches/the_old_rustic_bridge/notes.tenor.ily delete mode 100755 4-4_marches/the_old_rustic_bridge/tenor.ly delete mode 100755 4-4_marches/the_pikemans_march/config.ily delete mode 100755 4-4_marches/the_pikemans_march/drums.ly delete mode 100755 4-4_marches/the_pikemans_march/notes.side.ily delete mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.5.ily delete mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.6.ily delete mode 100755 4-4_marches/the_pikemans_march/notes.tenor.ily delete mode 100755 4-4_marches/the_pikemans_march/side.ly delete mode 100755 4-4_marches/the_pikemans_march/tenor.ly delete mode 100755 4-4_marches/were_no_awa_tae_bide_awa/config.ily delete mode 100755 4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily delete mode 100755 4-4_marches/were_no_awa_tae_bide_awa/side.ly delete mode 100755 4-4_marches/wings/config.ily delete mode 100755 4-4_marches/wings/notes.side.ily delete mode 100755 4-4_marches/wings/side.ly delete mode 100755 5-4_marches/cullen_bay/bass.ly delete mode 100755 5-4_marches/cullen_bay/config.ily delete mode 100755 5-4_marches/cullen_bay/drums.ly delete mode 100755 5-4_marches/cullen_bay/notes.bass.ily delete mode 100755 5-4_marches/cullen_bay/notes.side.ily delete mode 100755 5-4_marches/cullen_bay/notes.tenor.ily delete mode 100755 5-4_marches/cullen_bay/side.ly delete mode 100755 5-4_marches/cullen_bay/tenor.ly delete mode 100755 6-8_marches/hills_of_glenorchy/config.ily delete mode 100755 6-8_marches/hills_of_glenorchy/notes.side.ily delete mode 100755 6-8_marches/hills_of_glenorchy/side.ly delete mode 100755 airs/abide_with_me/config.ily delete mode 100755 airs/abide_with_me/notes.side.ily delete mode 100755 airs/abide_with_me/side.ly delete mode 100755 airs/alexander_mackenzie/config.ily delete mode 100755 airs/alexander_mackenzie/notes.side.ily delete mode 100755 airs/alexander_mackenzie/side.ly delete mode 100755 airs/amazing_grace/config.ily delete mode 100755 airs/amazing_grace/notes.side.ily delete mode 100755 airs/amazing_grace/side.ly delete mode 100755 airs/farewell_to_camraw/config.ily delete mode 100755 airs/farewell_to_camraw/drums.ly delete mode 100755 airs/farewell_to_camraw/notes.side.ily delete mode 100755 airs/farewell_to_camraw/notes.tenor.ily delete mode 100755 airs/farewell_to_camraw/side.ly delete mode 100755 airs/farewell_to_camraw/tenor.ly delete mode 100755 airs/flower_of_scotland/config.ily delete mode 100755 airs/flower_of_scotland/notes.side.ily delete mode 100755 airs/flower_of_scotland/side.ly delete mode 100755 airs/loch_duich/config.ily delete mode 100755 airs/loch_duich/notes.side.ily delete mode 100755 airs/loch_duich/side.ly delete mode 100755 airs/miss_kirkwood/config.ily delete mode 100755 airs/miss_kirkwood/notes.side.ily delete mode 100755 airs/miss_kirkwood/side.ly delete mode 100755 airs/morag_of_dunvegan/bass.ly delete mode 100755 airs/morag_of_dunvegan/config.ily delete mode 100755 airs/morag_of_dunvegan/drums.ly delete mode 100755 airs/morag_of_dunvegan/notes.bass.ily delete mode 100755 airs/morag_of_dunvegan/notes.side.ily delete mode 100755 airs/morag_of_dunvegan/notes.tenor.ily delete mode 100755 airs/morag_of_dunvegan/side.ly delete mode 100755 airs/morag_of_dunvegan/tenor.ly delete mode 100755 airs/my_home/config.ily delete mode 100755 airs/my_home/drums.ly delete mode 100755 airs/my_home/notes.bass.ily delete mode 100755 airs/my_home/notes.side.ily delete mode 100755 airs/my_home/notes.tenor.ily delete mode 100755 airs/my_home/side.ly delete mode 100755 airs/my_home/tenor.ly delete mode 100755 airs/the_mist_covered_mountains/config.ily delete mode 100755 airs/the_mist_covered_mountains/drums.ly delete mode 100755 airs/the_mist_covered_mountains/notes.side.ily delete mode 100755 airs/the_mist_covered_mountains/notes.tenor.ily delete mode 100755 airs/the_mist_covered_mountains/side.ly delete mode 100755 airs/the_mist_covered_mountains/tenor.ly delete mode 100644 book/.gitignore delete mode 100644 book/bass_book.tex delete mode 100644 book/clean delete mode 100644 book/drums_book.tex delete mode 100644 book/full_book.tex delete mode 100644 book/init delete mode 100644 book/load_scores delete mode 100644 book/makebook delete mode 100644 book/pipes_book.tex delete mode 100644 book/side_book.tex delete mode 100644 book/tenor_book.tex delete mode 100644 book/tex/main_bass.tex delete mode 100644 book/tex/main_drums.tex delete mode 100644 book/tex/main_full.tex delete mode 100644 book/tex/main_pipes.tex delete mode 100644 book/tex/main_side.tex delete mode 100644 book/tex/main_tenor.tex delete mode 100644 book/tex/score_book.cls delete mode 100644 book/tex/titlepage.tex delete mode 100755 build_all delete mode 100755 example.ly delete mode 100755 header_book.ily delete mode 100755 header_default.ily delete mode 100755 hornpipes/itchy_fingers/config.ily delete mode 100755 hornpipes/itchy_fingers/notes.side.ily delete mode 100755 hornpipes/itchy_fingers/side.ly delete mode 100755 jigs/seaforth_sticks/config.ily delete mode 100755 jigs/seaforth_sticks/drums.ly delete mode 100755 jigs/seaforth_sticks/notes.bass.ily delete mode 100755 jigs/seaforth_sticks/notes.side.ily delete mode 100755 jigs/seaforth_sticks/notes.tenor.ily delete mode 100755 jigs/seaforth_sticks/side.ly delete mode 100755 jigs/seaforth_sticks/tenor.ly rename {.lilydrum => lilydrum}/embellishments.ily (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/flourish_symbols/butterfly.eps (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/flourish_symbols/st_andrews_crss.eps (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/flourish_symbols/stop.eps (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/flourishing.ily (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/layout_tweaks.ily (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/musical_functions.ily (100%) mode change 100755 => 100644 rename {.lilydrum => lilydrum}/special_sticking.ily (100%) mode change 100755 => 100644 delete mode 100755 other/band_of_brothers.snare.ly delete mode 100755 standards/24_standards.side.ly delete mode 100755 standards/34_standards1.side.ly delete mode 100755 standards/34_standards2.side.ly delete mode 100755 standards/34_standards3.side.ly delete mode 100755 standards/44_standards.side.ly delete mode 100755 standards/68_standards.side.ly delete mode 100755 standards/standards.bass.ly delete mode 100755 standards/standards.tenor.ly delete mode 100755 strathspeys/aa_camerons/config.ily delete mode 100755 strathspeys/aa_camerons/notes.side.ily delete mode 100755 strathspeys/aa_camerons/side.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/bass.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/config.ily delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/drums.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/full.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.side.ily delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/pipes.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/side.ly delete mode 100755 strathspeys/lady_mackenzie_of_fairburn/tenor.ly delete mode 100755 strathspeys/molly_connell/bass.ly delete mode 100755 strathspeys/molly_connell/config.ily delete mode 100755 strathspeys/molly_connell/drums.ly delete mode 100755 strathspeys/molly_connell/notes.bass.ily delete mode 100755 strathspeys/molly_connell/notes.side.ily delete mode 100755 strathspeys/molly_connell/notes.side.v1.1.ily delete mode 100755 strathspeys/molly_connell/notes.tenor.ily delete mode 100755 strathspeys/molly_connell/side.ly delete mode 100755 strathspeys/molly_connell/tenor.ly delete mode 100755 template/config.ily delete mode 100755 template/drums.ly delete mode 100755 template/full.ly delete mode 100755 template/notes.bass.ily delete mode 100755 template/notes.pipes.ily delete mode 100755 template/notes.side.ily delete mode 100755 template/notes.tenor.ily delete mode 100755 template/pipes.ly delete mode 100755 template/side.ly delete mode 100755 template/tenor.ly diff --git a/.gitignore b/.gitignore index 9c0039b..128ea98 100755 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,3 @@ -*.ps *.pdf -*.png -*.log -*tmp* -*.py -*.toc -*.aux -_output/ -pdf/ -fullscores/* +/pdf +/tmp diff --git a/2-4_marches/black_bear/config.ily b/2-4_marches/black_bear/config.ily deleted file mode 100755 index 514c3ac..0000000 --- a/2-4_marches/black_bear/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 2/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Black Bear" -meter = "March" \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily deleted file mode 100755 index 2a4e129..0000000 --- a/2-4_marches/black_bear/notes.side.ily +++ /dev/null @@ -1,31 +0,0 @@ -% 2/4 Black Bear -% Snare -\version "2.18.2" -composerSnare = "E.T. de Boone, 2015" - -%%music -snareA = \drummode { - d8:32( | - g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d32 g32 d32 g32 d4 | - r4^\markup {\bold HOI} d8:32( g8:32)(-> | - - d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d4 d4:32( | - d8) \flamg g8 \flamd d8 -} -% Part 2 -snareBA = \drummode { - g8 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - d4:32( d4:32)( | - d8) g16. d32-> g16. g32 \flamd d16. g32 | - - d4:32( d8.:32)( g16:32)( | - d8:32)( g8:32)( d4)( | - g8:32)( d8:32)( g16.) d32-> g16. g32 | - \flamd d8 d8:32( g8) -} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.2.ily b/2-4_marches/black_bear/notes.side.v1.2.ily deleted file mode 100755 index ff4ce2e..0000000 --- a/2-4_marches/black_bear/notes.side.v1.2.ily +++ /dev/null @@ -1,33 +0,0 @@ -% 2/4 Black Bear -% Snare -\version "2.18.2" -composerSnare = "E.T. de Boone, v1.2, 2015" - -%%music -yell = \markup { \bold HOI} - -snareA = \drummode { - d8:32( | - g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | - r4^\yell d8:32( g8:32)(-> | - - d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d4 d4:32( | - d8) \flam g8 \flam d8 -} -% Part 2 -snareBA = \drummode { - g8 | - \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | - \flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | - \tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | - \flam d8:32( g16.)(-> g32) d32 g16. d16. g32 | - - \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | - \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | - g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | -} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.3.ily b/2-4_marches/black_bear/notes.side.v1.3.ily deleted file mode 100755 index 8386890..0000000 --- a/2-4_marches/black_bear/notes.side.v1.3.ily +++ /dev/null @@ -1,33 +0,0 @@ -% 2/4 Black Bear -% Snare -\version "2.18.2" -composerSide = "E.T. de Boone, v1.3, 2015" - -%%music -yell = \markup { \bold HOI} - -snareA = \drummode { - d8:32( | - g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16.-> \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 | - \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | - r4^\yell d8:32( \< g8:32)(-> | - - d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | - \flam d4 d4:32( | - d8) \flam g8 \flam d8 -} -% Part 2 -snareBA = \drummode { - g8 - \flamd \tuplet 3/2 { d16 g16 d16->} g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | - d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | - \tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | - d8:32( g16.)(-> g32) d32 g16. d16. g32 | - - \flamd \tuplet 3/2 { d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | - \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \flamd \tuplet 3/2 { d32 d32 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | - \flam d16. g32-> d16. d32 \flamg \tuplet 3/2 { g16[ d16 g16-> } d16. \drag g32] | - g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | -} \ No newline at end of file diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly deleted file mode 100755 index 63f7b68..0000000 --- a/2-4_marches/black_bear/side.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.v1.3.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \halfline \break \halfline } \break - \part \line \bar "|." - } - { - \snareA s8 - - \snareBA - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/config.ily b/2-4_marches/duncan_mcinness/config.ily deleted file mode 100755 index d691081..0000000 --- a/2-4_marches/duncan_mcinness/config.ily +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 2/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Duncan McInnes" -meter = "Drum Salute in Quick Time" \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/notes.side.ily b/2-4_marches/duncan_mcinness/notes.side.ily deleted file mode 100755 index da43ca6..0000000 --- a/2-4_marches/duncan_mcinness/notes.side.ily +++ /dev/null @@ -1,83 +0,0 @@ -% 2/4 Black Bear -% Snare -\version "2.18.2" -composerSnare = "E.T. de Boone, 2015" - -%%music -snareA = \drummode { - d8:32( | - g8) d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) -} -% Part 2 -snareB = \drummode { - r16. g32 | - \flamd d8 d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8:32( g8) | - - \flamd d8. d16 \flamg g16 r16 g16 \flamd d16 | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8. g16 | - - \flamd d8 d16. g32-> d16. d32 \flamg g8 | - \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) -} -% Part 3 -snareC = \drummode { - d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) -} -% Part 4 -snareDA = \drummode { - d16. g32 | - d8:32( g8:32)(-> d8.) d16:64( | - d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) d16. g32 d8:32( g8) | - \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | -} -snareDAB = \drummode { - d8:32( g8:32)(-> d8.) d16:64( | - d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - - g8) \flamd d8 d16 \flamg g8 g16 | - \flamd d8 d8:32( g8) -} -snareDAC = \drummode { - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | - d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - << - { - g8) \flamd d8 d16 \flamg g8 g16 | - } - \new PipeBandDrumStaff{ - \eighthBeaming - \once \omit Staff.TimeSignature - g16. d32:128( d16.) g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | - } - >> - - \flamd d8 d8:32( g4) - \bar "|." -} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly deleted file mode 100755 index eb5a099..0000000 --- a/2-4_marches/duncan_mcinness/side.ly +++ /dev/null @@ -1,32 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line } \break - \repeat volta 2 { \part \line } \break - \repeat volta 2 { \part \line } \break - \part \halfline \halfline \bar "||" \break - \part \halfline \halfline \bar "|." - } - { - \snareA s8 - \snareB s8 - \snareC s8 - \snareDA \snareDAB s8 - \snareDA \snareDAC - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily deleted file mode 100755 index e06e3f9..0000000 --- a/2-4_marches/mackenzie_highlanders/config.ily +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 2/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "MacKenzie Highlanders" -meter = "Trooping of the Colours" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily deleted file mode 100755 index 75ff26a..0000000 --- a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily +++ /dev/null @@ -1,48 +0,0 @@ -% 2/4 MacKenzie Highlanders -% Snare -\version "2.18.2" -composerSide = "alternate version" - -%%music -snareA = \drummode { - d8:32( | - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - d8:64(-> g32) d g d g8 d8:32( | - - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) -} -% Part 2 -snareBA = \drummode { - g8 | - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - d8:64(-> g32) d g d g8 g8-> | - - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d8) g8 -} -snareBB = \drummode { - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | - \flam d4 d8:32(-> \< g8:32)(-> | - - d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } - d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | - - d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | - d4:32( d4) -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily deleted file mode 100755 index e96556f..0000000 --- a/2-4_marches/mackenzie_highlanders/notes.side.ily +++ /dev/null @@ -1,36 +0,0 @@ -% 2/4 MacKenzie Highlanders -% Snare -\version "2.18.2" -composerSnare = "" - -%%music -snareA = \drummode { - d8:32( | - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - - \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | - d4:32( d8) d8:32( | - - g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | - \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | - - - \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | - d4:32( d8) -} -% Part 2 -snareB = \drummode { - g8 | - d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | - d8-> d8:32( g8) d16. g32 | - - d8:32( \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 | - d4:32( d8) g8 | - - d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | - - \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | - d4:32( d8) -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly deleted file mode 100755 index c1d5d78..0000000 --- a/2-4_marches/mackenzie_highlanders/side.alt.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.alt.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line } \break - \part \line \bar "||" \break - \line \bar "|." - } - { - \snareA s8 - \snareBA - \snareBB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly deleted file mode 100755 index 049f71b..0000000 --- a/2-4_marches/mackenzie_highlanders/side.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line } \break - \repeat volta 2 { \part \line } - } - { - \snareA s8 - \snareB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/config.ily b/3-4_marches/castle_dangerous/config.ily deleted file mode 100755 index f62ad90..0000000 --- a/3-4_marches/castle_dangerous/config.ily +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 3/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Castle Dangerous" -meter = "March" - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/notes.tenor.ily b/3-4_marches/castle_dangerous/notes.tenor.ily deleted file mode 100755 index 2cb9a1e..0000000 --- a/3-4_marches/castle_dangerous/notes.tenor.ily +++ /dev/null @@ -1,24 +0,0 @@ -% 3/4 Castle Dangerous -% Tenor -\version "2.18.2" -composerTenor = "" - -%%music -tenorA = \drummode { - r8. d16 - g4 - r8 d8 - | - r8 g8 - r8 d8 - r8 g8 - | - r8 d8 - r8 g8 - r8 d8 - | - r8 g8 - r8 d16 g - d16 g d g - | -} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/tenor.ly b/3-4_marches/castle_dangerous/tenor.ly deleted file mode 100755 index 87e0cd6..0000000 --- a/3-4_marches/castle_dangerous/tenor.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \line } - } - { - \tenorA - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/config.ily b/3-4_marches/on_the_road_to_passchendaele/config.ily deleted file mode 100755 index 1eab0ad..0000000 --- a/3-4_marches/on_the_road_to_passchendaele/config.ily +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 3/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "On the Road to Passchendaele" -meter = "Retreat" - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily deleted file mode 100755 index 2dc6ba8..0000000 --- a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily +++ /dev/null @@ -1,35 +0,0 @@ -% 3/4 On the Road to Passchendaele -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareAA = \drummode { - \flamd d8. g16 d4:32( d8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | - - d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | -} -snareAB = \drummode { - \flamd d8. g16 d4:32( d8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | - - \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | - d16. d32 \flamg g8 d4:32( d4) -} -% Part 2 -snareBA = \drummode { - d16[ \dragg g8 g16] d8:32( g8) d4:32( | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d4 d4:32( | - - d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | - \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | -} -snareBB = \drummode { - d8. g16 d8:32( g8) d4:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | - - \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | - d16. d32 \flamg g8 d4:32( d4) -} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/side.ly b/3-4_marches/on_the_road_to_passchendaele/side.ly deleted file mode 100755 index 6c6e7dc..0000000 --- a/3-4_marches/on_the_road_to_passchendaele/side.ly +++ /dev/null @@ -1,33 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \line } \break - \line \bar "||" \break - \line \bar "|." - } - { - \snareAA - \snareAB - - \snareBA - \snareBB - - \snareBA - \snareAB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily deleted file mode 100755 index 62bd8fc..0000000 --- a/4-4_marches/51st_highland_division/config.ily +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "51st Highland Division" -meter = "March" - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily deleted file mode 100755 index 96649e7..0000000 --- a/4-4_marches/51st_highland_division/notes.side.ily +++ /dev/null @@ -1,29 +0,0 @@ -% 4/4 51st Highland Division -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareA = \drummode { - d16. g32 | - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | -} -snareAA = \drummode { - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - \flamg g4 d4:32( d4) r8 -} -snareAB = \drummode { - d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | - \flamg g4 d4:32( d4) r8 -} -% Part 2 -snareB = \drummode { - d16. g32 | - d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | - - d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | - - \flamg g4 d4:32( d4) r8 -} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly deleted file mode 100755 index 2133e85..0000000 --- a/4-4_marches/51st_highland_division/side.ly +++ /dev/null @@ -1,35 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { - \repeat volta 2 { \part \halfline \break} - \alternative { {\halfline} {\halfline } } - \bar "|." \break - \part \line \bar "||" \break - \line \bar "|." - } - } - { - \snareA - \snareAA s8 - \snareAB s8 - - \snareB - \snareA \snareAB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/config.ily b/4-4_marches/flett_from_flotta/config.ily deleted file mode 100755 index 0a1c04c..0000000 --- a/4-4_marches/flett_from_flotta/config.ily +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Flett from Flotta" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/notes.side.ily b/4-4_marches/flett_from_flotta/notes.side.ily deleted file mode 100755 index ee07480..0000000 --- a/4-4_marches/flett_from_flotta/notes.side.ily +++ /dev/null @@ -1,29 +0,0 @@ -% 4/4 Flett from Flotta -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareA = \drummode { - d8:32( | - g8.) g16 d8:32( g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32)( | - d4) d8:32(-> \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32 \flamd d8 d8:32( | - d4)-> d4:32( d4) d4:32( | - g8.) g16 d8:32( g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8) | - \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | - d4)-> d4:32( d4) r8 -} -% Part 2 -snareB = \drummode { - d4:32( d8) d32 g d g d32 g d g d8 \flamg g8 d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 d4:32( g8:32)(-> d8:32)(-> | - d4) r4 r4 r4 | - d8.:32(-> g16) d8:32(-> g8)-> d32 g d g d16. g32-> r16 g16-> r16 g16-> | - - g8.:32(-> g16) d8:32(-> g8) d4:32( d8) d8:32( | - g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | - \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | - d4)-> d4:32( d4) r8 -} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/side.ly b/4-4_marches/flett_from_flotta/side.ly deleted file mode 100755 index 33c6635..0000000 --- a/4-4_marches/flett_from_flotta/side.ly +++ /dev/null @@ -1,28 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line \break \line } - \repeat volta 2 { \line \break \line } - - } - { - \snareA s8 - - \snareB s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily deleted file mode 100755 index 0670598..0000000 --- a/4-4_marches/minstrel_boy/config.ily +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Minstrel Boy" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/notes.side.ily b/4-4_marches/minstrel_boy/notes.side.ily deleted file mode 100755 index 0c3d098..0000000 --- a/4-4_marches/minstrel_boy/notes.side.ily +++ /dev/null @@ -1,33 +0,0 @@ -% 4/4 Minstrel Boy -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareAA = \drummode { - d16. g32 | - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - \break - d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) -} -snareAB = \drummode { - \dragd d16. d32-> g16. g32 | - d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - \break - d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) -} -% Part 2 -snareBA = \drummode { - \flamd d8. d16:32( | - g16) g16 d8:32( g16) g16 d8:32( g8:32)( d8) r8 d8:32( | - g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | - - d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | - \flamd d4 d4:32( d4) -} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly deleted file mode 100755 index c1d3c30..0000000 --- a/4-4_marches/minstrel_boy/side.ly +++ /dev/null @@ -1,33 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \part \line \break - \line \break \bar "|." - - \partial 4 s4 | - \line \break - \line \break \bar "|." - } - { - \snareAA - \snareAB s4 - - \snareBA - \snareAB r8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/config.ily b/4-4_marches/rowan_tree/config.ily deleted file mode 100755 index 618eb0f..0000000 --- a/4-4_marches/rowan_tree/config.ily +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 4 s4 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Rowan Tree" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily deleted file mode 100755 index 3a89957..0000000 --- a/4-4_marches/rowan_tree/notes.side.ily +++ /dev/null @@ -1,23 +0,0 @@ -% 4/4 Rowan Tree -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareEnding = \drummode { - \flamd d8[ d8]:32( g8[) d8]:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | - d4 d4:32( d4) -} -snareA = \drummode { - r8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | - \snareEnding -} -% Part 2 -snareBA = \drummode { - d8. g16 | - d8[:32(-> g8]:32)(-> g8[:32)( d8]:32)(-> g8[:32)( d8]:32)(-> g8[)-> d8]:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | - \snareEnding -} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly deleted file mode 100755 index 552d64c..0000000 --- a/4-4_marches/rowan_tree/side.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line \break } - \part \line \bar "||" - } - { - \snareA s4 - - \snareBA - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily deleted file mode 100755 index 211da0d..0000000 --- a/4-4_marches/scotland_the_brave/config.ily +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Scotland the Brave" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily deleted file mode 100755 index 6877598..0000000 --- a/4-4_marches/scotland_the_brave/notes.side.ily +++ /dev/null @@ -1,21 +0,0 @@ -% 4/4 Scotland the Brave -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareA = \drummode { - d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | - g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | - \flamd d4 d4:32( d4) r8 -} -% Part 2 -snareBA = \drummode { - g8 | - d4:32( d8) g8 d4:32( d8) g8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | - d4:32( d8) g8 d4:32( d8) g8 | - \flamd d4 d4:32( d4) r8 -} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly deleted file mode 100755 index 5a8db2e..0000000 --- a/4-4_marches/scotland_the_brave/side.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 {\part \line \break } - \part \line \bar "||" - } - { - \snareA s8 - - \snareBA - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily deleted file mode 100755 index da97336..0000000 --- a/4-4_marches/the_leaving_of_liverpool/config.ily +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 4 s4 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "The Leaving of Liverpool" -meter = "March" \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly deleted file mode 100755 index 6e27158..0000000 --- a/4-4_marches/the_leaving_of_liverpool/drums.ly +++ /dev/null @@ -1,63 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -%\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { - \repeat volta 2 { \part \line } \break - \part \line \break - \line \bar "|." - } - { - \snareA s4 - - \snareBA - \snareBB - } - >> - } - %\new PipeBandDrumStaff = "bass" { - % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - % - % \bassA - % s16 \bassBA \bassBB - %} - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - r8 r16 \tenorA s4 - r8 r16 \tenorA - r8 r16 \tenorA - s4 - - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.side.ily b/4-4_marches/the_leaving_of_liverpool/notes.side.ily deleted file mode 100755 index 468df71..0000000 --- a/4-4_marches/the_leaving_of_liverpool/notes.side.ily +++ /dev/null @@ -1,33 +0,0 @@ -% 2/4 Black Bear -% Snare -\version "2.18.2" -composerSnare = "E.T. de Boone, 2015" - -%%music -snareA = \drummode { - r8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | - \flamd d4 d4:32( d4) -} -% Part 2 -snareBA = \drummode { - \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | - \flamd d4 d4:32( d4) -} -snareBB = \drummode{ - \flamd d4 | - d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | - - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - - \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | - - d4 d4:32( d4) -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily deleted file mode 100755 index a220de9..0000000 --- a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily +++ /dev/null @@ -1,27 +0,0 @@ -% 4/4 The Leaving of Liverpool -% Tenor -\version "2.18.2" -composerTenor = "F.J. de Boone,2011" - -%%music -tenorA = \drummode { - g16 | - d8[ g] - d[ g] - d[ g] - d[ g] - | - d4 - r8. g16 - d4 - r8. g16 - | - d8[ g] - d[ g] - d[ g] - d[ g] - | - d16 g d g - d g d g - d4 -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly deleted file mode 100755 index b9c7f73..0000000 --- a/4-4_marches/the_leaving_of_liverpool/side.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line } \break - \part \line \break - \line \bar "|." - - } - { - \snareA s4 - - \snareBA - \snareBB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly deleted file mode 100755 index df92d86..0000000 --- a/4-4_marches/the_leaving_of_liverpool/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \partial 16 s16 \line }} - {\tenorA d4 r8.} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily deleted file mode 100755 index a797132..0000000 --- a/4-4_marches/the_old_rustic_bridge/config.ily +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "The Old Rustic Bridge" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/notes.tenor.ily b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily deleted file mode 100755 index d6d261b..0000000 --- a/4-4_marches/the_old_rustic_bridge/notes.tenor.ily +++ /dev/null @@ -1,13 +0,0 @@ -% 4/4 The Olde Rustic Bridge -% Tenor -\version "2.18.2" -composerTenor = "" - -%%music -tenorA = \drummode { - g16 | - d4 g8 d g4 d8. g16 | - d8 g d4 g r | - d4 g8[ d] g[ d] g[ d] | - g4 r4 d4 r4 | -} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly deleted file mode 100755 index 284c092..0000000 --- a/4-4_marches/the_old_rustic_bridge/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat unfold 2 {\repeat volta 2 { \part \line } \break }} - {\repeat unfold 2 {s16\tenorA}} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily deleted file mode 100755 index 1907399..0000000 --- a/4-4_marches/the_pikemans_march/config.ily +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -line = { \repeat unfold 4 { s1 | } } - -%% Headers -title = "The Pikeman's March" -meter = "March" - - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly deleted file mode 100755 index a68bdc2..0000000 --- a/4-4_marches/the_pikemans_march/drums.ly +++ /dev/null @@ -1,68 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -%\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.v1.6.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { \repeat volta 2 { \part \line \break \line} \break - \part \line \break - \line \break - \line \bar "|." - } - { \snareAA - \snareAB - s8 - - \snareBA - \snareBB - \snareBC - } - >> - } - %\new PipeBandDrumStaff = "bass" { - % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - % - % \bassA - % s16 \bassBA \bassBB - %} - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorAA - \tenorAB - s8 - - s8 - \tenorBA - \tenorBB - \tenorBC - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily deleted file mode 100755 index 23e4242..0000000 --- a/4-4_marches/the_pikemans_march/notes.side.ily +++ /dev/null @@ -1,39 +0,0 @@ -% 4/4 The Pikeman's March -% Side -\version "2.18.2" -composerSide = "E.T. de Boone, 2014" - -%%music -snareAA = \drummode { - g8 | - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | - \flamd d4 d4:32( d4) r8 g8 | -} -snareAB = \drummode { - \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | - \flamd d4 d4:32( d4) r8 -} -snareBA = \drummode { - d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | -} -snareBB = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | -} - -snareBC = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.5.ily b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily deleted file mode 100755 index 4671802..0000000 --- a/4-4_marches/the_pikemans_march/notes.side.v1.5.ily +++ /dev/null @@ -1,39 +0,0 @@ -% 4/4 The Pikeman's March -% Side -\version "2.18.2" -composerSide = "E.T. de Boone, v1.5, 2015" - -%%music -snareAA = \drummode { - g16. g32 | - \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | - \flamd d8.. g32 \tuplet 3/2 { d16 d g} \flam d16. g32 \tuplet 3/2 { d16 d g } \flam d16. g32 \flam d16. d32 \tuplet 3/2 { g16 g d } - \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | -} -snareAB = \drummode { - \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | - \flam d8. g16 d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> d8.)-> \parenthesize d16:64( \parenthesize d8:64) -} -snareBA = \drummode { - d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | -} -snareBB = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | -} - -snareBC = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.6.ily b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily deleted file mode 100755 index eafdf43..0000000 --- a/4-4_marches/the_pikemans_march/notes.side.v1.6.ily +++ /dev/null @@ -1,39 +0,0 @@ -% 4/4 The Pikeman's March -% Side -\version "2.18.2" -composerSide = "E.T. de Boone, v1.6, 2015" - -%%music -snareAA = \drummode { - g16. g32 | - \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | - \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | - \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | -} -snareAB = \drummode { - \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | - \flam d8. g16 d8:32(-> g8:32)(-> d8.)-> d16:64( d8:64) -} -snareBA = \drummode { - d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | - d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | - \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | -} -snareBB = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | - \flamd d4 d4:32( d4) r8 d16. g32 | -} - -snareBC = \drummode { - \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | - d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | - \flamd d4 d8:32( g8:32)(-> d4) r4 -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily deleted file mode 100755 index 628086f..0000000 --- a/4-4_marches/the_pikemans_march/notes.tenor.ily +++ /dev/null @@ -1,41 +0,0 @@ -% 4/4 The Pikeman's March -% Tenor -\version "2.18.2" -composerTenor = "E.T. de Boone, v0.3, 2015" - -%%music -tenorAA = \drummode { - d16 \< g16 | - d4 \! g8. d16 r8 d16 g d4 - | - d8 g d8 g d4 g4 - | - d4-> r16 d16 r8 r16 g16 r8 r16 d r g - | - d4 d8^\markup{scoop} g d4^\markup{end} r8 -} -tenorAB = \drummode { - d16 \< g16 | - d4 \! g8. d16 r8 d16 g d4 - | - d8 g d8 g d4 g4 - | - d8 g r8 g8 d8 g8 r4 - | - d4 d8^\markup{scoop} g d4^\markup{end} r8 -} -% Part 2 -tenorBA = \drummode { - d8-_ g - d8 g - d8 g - d8 g - | - s1*3 -} -tenorBB = \drummode { - s1*4 -} -tenorBC = \drummode { - s1*4 -} diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly deleted file mode 100755 index 6aac954..0000000 --- a/4-4_marches/the_pikemans_march/side.ly +++ /dev/null @@ -1,32 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.v1.6.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \part \line \break \line} \break - \part \line \break - \line \break - \line \bar "|." - } - { - \snareAA - \snareAB - s8 - - \snareBA - \snareBB - \snareBC - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly deleted file mode 100755 index 86e7e61..0000000 --- a/4-4_marches/the_pikemans_march/tenor.ly +++ /dev/null @@ -1,32 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \part \line \break \line} \break - \part \line \break - \line \break - \line \bar "|." - } - { - \tenorAA - \tenorAB - - s8 - \tenorBA - \tenorBB - \tenorBC - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file 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 deleted file mode 100755 index 7f4c476..0000000 --- a/4-4_marches/were_no_awa_tae_bide_awa/config.ily +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "We're No' Awa Tae Bide Awa" -meter = "March" \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily deleted file mode 100755 index db5105c..0000000 --- a/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily +++ /dev/null @@ -1,19 +0,0 @@ -% 4/4 We're No Awa Tae Bide Awa -% Snare -\version "2.18.2" -composerSide = "" - -%%music -snareAA = \drummode { - d16. g32 | - d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | - \tuplet 3/2 { g16) d g } \flam d16. g32 \tuplet 3/2 { d16 g d } \flam g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flam d8 r8 | - d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | - g4) d4:32( d4) r8 g8 | -} -snareAB = \drummode { - d2:32(\< d4)\! r8 g8 | - d8[:32( g8]) g8[ d8]:32( d8[) r8 r8 g8 | - \flam d8 g16. d32-> g16. g32 \flam d16. g32 \flam d16. d32:128( d16) g16-> d16 g d \flam d | - d4 d4:32( d4) r8 -} \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/side.ly b/4-4_marches/were_no_awa_tae_bide_awa/side.ly deleted file mode 100755 index 484c510..0000000 --- a/4-4_marches/were_no_awa_tae_bide_awa/side.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 {\part \line \break \line \break} - } - { - \snareAA - - \snareAB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily deleted file mode 100755 index b2554d2..0000000 --- a/4-4_marches/wings/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -line = { \repeat unfold 2 { s1 | } } - -%% Headers -title = "Wings" -meter = "March" \ No newline at end of file diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily deleted file mode 100755 index 9bae983..0000000 --- a/4-4_marches/wings/notes.side.ily +++ /dev/null @@ -1,28 +0,0 @@ -% 4/4 Wings -% Snare -\version "2.18.2" -composerSide = "K. Westerkamp, 2003" - -%%music -snareAA = \drummode { - d8:32( \mf | - g8.) \parenthesize d16 d8:32( g8) r8 d32-> \< g d g d-> g d g d8-> \! | - \flamd d8 \f g16. d32-> g16. g32 \flamd d8 d4:32( \< d8) \! d16. g32 | -} -snareABA = \drummode { - d4:32( \< d8) \! \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d8 d16.[ g32 \dragd d8] d32 g d g d8 d4:32( -} -snareABB = \drummode { - d4:32)( \< d8) \! \flamg g8 d32 g d g d8 d16.[ g32 \dragd d8] | - d32 g d g d8 d4:32( d4) r8 -} -% Part 2 -snareBA = \drummode { - d8:32( | - g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> \< g8:32)(-> | - d8.)-> \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | - - \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 \p g d } \flamg g8 | - \flamd d4 r4 d8[:32(-> \< g8]:32)(-> d8[:32)(-> g8]:32)(-> | s256) \! -} \ No newline at end of file diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly deleted file mode 100755 index 025f155..0000000 --- a/4-4_marches/wings/side.ly +++ /dev/null @@ -1,39 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \partial 8 s8 - \repeat volta 2 { - s1 | s1 - } - \alternative { - { s1 | s1 } - { s1 | s2^"Fine" s4 s8 \bar "|."} - } - \partial 8 s8 - s1 - s1 - s1 - s1^"D.C. al Fine" \bar "||" - } - { - \snareAA - \snareABA - \snareABB - \snareBA - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly deleted file mode 100755 index c6a3c6b..0000000 --- a/5-4_marches/cullen_bay/bass.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.bass.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { \repeat volta 2 { \line } } - { \bassA } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentBass - composer = \composerBass - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/config.ily b/5-4_marches/cullen_bay/config.ily deleted file mode 100755 index c493eea..0000000 --- a/5-4_marches/cullen_bay/config.ily +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 5/4 - \eighthBeaming - } -%% Format -part = {\partial 8 s8 } -line = { \repeat unfold 4 { s2 s2. } } - -%% Headers -title = "Cullen Bay" -meter = "March" \ No newline at end of file diff --git a/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly deleted file mode 100755 index 6371e96..0000000 --- a/5-4_marches/cullen_bay/drums.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \global - << - { - \repeat unfold 4 { - \line - \break - \line - \bar "|." - } - }%End of Format - { - \repeat unfold 2 { \snareA } - \repeat unfold 2 { \snareB } - \repeat unfold 2 { \snareC } - \repeat unfold 2 { \snareD } - } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \repeat unfold 4 { - \bassA - } - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \repeat unfold 4 { - \tenorAA \tenorAB - } - } - >> - \header { - title = \title - meter = \meter - composer = \markup \tiny { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.bass.ily b/5-4_marches/cullen_bay/notes.bass.ily deleted file mode 100755 index 515347c..0000000 --- a/5-4_marches/cullen_bay/notes.bass.ily +++ /dev/null @@ -1,7 +0,0 @@ -% 5/4 Cullen Bay -% Bass -\version "2.18.2" -composerBass = "" -bassA = \drummode { - \repeat unfold 4 { d4-^ g d-> g d | } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily deleted file mode 100755 index 128fa28..0000000 --- a/5-4_marches/cullen_bay/notes.side.ily +++ /dev/null @@ -1,62 +0,0 @@ -% 5/4 Cullen Bay -% Side -\version "2.18.2" -composerSide = "" -snareEnd = \drummode { - d8[:32)(-> g16.) g32]-> - d8[:32(-> g8]:32)(-> - d8[:32)( g8]:32)(-> - d4) - d4:32( - | - d8) d8:32( - \triplet { g16)[ d g } \flam d8] - g16. d32-> g16. g32 - \flam d8 d16. g32 -> - d16. d32 \flam g8 - | - \flam d8. d16:64( - d8) d8:32( - \triplet { g16) d g } \flam d8 - d4:32( - d4) -} -snareA = \drummode { - \flam d8.[ g16] - d8[:32( g8]) - \flam d8[ d8]:32( - \triplet { g16[) d g } \flam d16. g32] - \triplet { g16[ d g } \flam g8] - | - \snareEnd -} - -snareB = \drummode{ - \flamd d8[ d16 \flam g16] - r16 g16[ \flam d g]\v - r16 d16[ \flam g8] - \flam d4 - d4:32( - | - \snareEnd -} - -snareC = \drummode{ - \flam d8-> \flam d16-> g-> - d16 d \flam g8 - g8 d8:32( - \triplet { g16) d g } \flam d16. g32 - \triplet { g16 d g } \flam g8 - | - \snareEnd -} - -snareD = \drummode{ - \flam d16. g32 d16. g32-> - d32 g d g d16. g32 - d16. g32-> d32 g d g - d4 - d4:32( - | - \snareEnd -} diff --git a/5-4_marches/cullen_bay/notes.tenor.ily b/5-4_marches/cullen_bay/notes.tenor.ily deleted file mode 100755 index 2a38922..0000000 --- a/5-4_marches/cullen_bay/notes.tenor.ily +++ /dev/null @@ -1,16 +0,0 @@ -% 5/4 Cullen Bay -% Tenor -\version "2.18.2" -composerTenor = "" -tenorAA = \drummode { - d8-> g d g d-> g d4 d4 | - d8. g16 d8-> g8-> r8 g8 d4 d4 | - d8-> g d g d-> g d8.-> g16-> r8 d8-> | - d4 d4 d8 g8 d4 d4 | -} -tenorAB = \drummode { - d4 g4 d4 g4 d4 | - d8. g16 d8-> g8-> r8 g8 d4 d4 | - d4 g4 d8-> g8 d8.-> g16-> r8 d8-> - d4 d4 d8 g8 d4 d4 | -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/side.ly b/5-4_marches/cullen_bay/side.ly deleted file mode 100755 index 0b7d3b5..0000000 --- a/5-4_marches/cullen_bay/side.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 1 { \line } \break - \repeat volta 1 { \line } \break - \repeat volta 1 { \line } \break - \repeat volta 1 { \line } \break - } - { - \snareA - \snareB - \snareC - \snareD - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly deleted file mode 100755 index 4b1a939..0000000 --- a/5-4_marches/cullen_bay/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { \repeat unfold 1 { \line \line \bar "|."} } - { \tenorAA \tenorAB } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/config.ily b/6-8_marches/hills_of_glenorchy/config.ily deleted file mode 100755 index b017bef..0000000 --- a/6-8_marches/hills_of_glenorchy/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Hills of Glenorchy" -meter = "March" \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/notes.side.ily b/6-8_marches/hills_of_glenorchy/notes.side.ily deleted file mode 100755 index 2d185ac..0000000 --- a/6-8_marches/hills_of_glenorchy/notes.side.ily +++ /dev/null @@ -1,33 +0,0 @@ -% 6/8 Hills of Glenorchy -% Snare -\version "2.18.2" -composerSnare = "G. Clark, 1977" - -%%music -snareA = \drummode { - d8 | - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | - d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | - d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | - - \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | - \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) -} -% Part 2 -snareBA = \drummode { - \tuplet 5/2 { d16 g d g d } | - g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | - g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 - - \break - - \flamg g8. d16 g8 d4.:32( | - d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | - \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | - g8.:32)( d16) g8:32(-> d4) -} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/side.ly b/6-8_marches/hills_of_glenorchy/side.ly deleted file mode 100755 index b7e19df..0000000 --- a/6-8_marches/hills_of_glenorchy/side.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \halfline \break \halfline } - \repeat volta 2 { \part \halfline \break \halfline } - } - { - \snareA s8 - \snareBA s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily deleted file mode 100755 index 9e59ebe..0000000 --- a/airs/abide_with_me/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Abide with Me" -meter = "Hymn" \ No newline at end of file diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily deleted file mode 100755 index b299079..0000000 --- a/airs/abide_with_me/notes.side.ily +++ /dev/null @@ -1,16 +0,0 @@ -% 4/4 Abide with Me -% Side -\version "2.18.2" -composerSide = "W.H. de Boone, 2014" -snareAA = \drummode { - \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | - \flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | - \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8 \flam g-> | - d4:32( \< d4:32)( d4:32)( d4:32)( \! \> | -} -snareAB = \drummode { - \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 \flam g | - \flam d8->\< \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8[ \drag g]->\! | - d4:32( \> d4:32)( d4:32)( d4:32)( | - d4:32)( \< d4:32)( d4:32)( d4:32) \! -} \ No newline at end of file diff --git a/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly deleted file mode 100755 index 882b282..0000000 --- a/airs/abide_with_me/side.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 {\halfline \break} - \alternative { - { \halfline \break } - { \halfline \bar "|."} - } - - } - { - \snareAA - \snareAA - \snareAB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily deleted file mode 100755 index 51fa66c..0000000 --- a/airs/alexander_mackenzie/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Alexander MacKenzie" -meter = "Slow March" \ No newline at end of file diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily deleted file mode 100755 index 0df83a0..0000000 --- a/airs/alexander_mackenzie/notes.side.ily +++ /dev/null @@ -1,36 +0,0 @@ -% 6/8 Alexander MacKenzie -% Side -\version "2.18.2" -composerSide = "" -snareAA = \drummode { - d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | - - d4) d16. g32 d8:32( d8) g8 | - \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 -} -snareAB = \drummode { - d16. g32 | - d8:32( d8.)-> g16 d4:32( d8) | - \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | - - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) -} -snareBA = \drummode { - d8:32( | - g4) \flamd d16. g32 d8:32( d8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( - - g4) \flamd d16. g32 d8:32( d8.) g16 | - d4.:32( d4) -} -snareBB = \drummode { - d8:32( | - g4) \flamd d16. g32 d8:32( d8) \flamd d8 | - d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | - - d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | - d4.:32( d4) -} diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly deleted file mode 100755 index bfabc04..0000000 --- a/airs/alexander_mackenzie/side.ly +++ /dev/null @@ -1,31 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line \break } \break - \repeat volta 2 { \part \halfline \break } - \alternative{ {\part \halfline \break}{\part \halfline \break} } - \bar "|." - } - { - \snareAA \snareAB s8 - - \snareBA s8 - \snareBB s8 - \snareAB s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily deleted file mode 100755 index f632530..0000000 --- a/airs/amazing_grace/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 3/4 - } - -%% Format -part = { \partial 4 s4 } -halfline = { \repeat unfold 2 { s4*3 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Amazing Grace" -meter = "Hymn" \ No newline at end of file diff --git a/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily deleted file mode 100755 index 1de8d94..0000000 --- a/airs/amazing_grace/notes.side.ily +++ /dev/null @@ -1,31 +0,0 @@ -% 3/4 Amazing Grace -% Side -\version "2.18.2" -composerSide = "" -snarePart = \drummode { - \flamd d8. g16 | -} -snareAA = \drummode { - \flamd d2)\! \flamd d8 g16 d16 | - \flamd d2 \flamd d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | -} -snareAB = \drummode { - \flamd d2 \flamd d8 g16 d16 | - \flamd d2 \flamd d8. \flamg g16-> | - d4:32(\< d4:32)( d4:32)(\> | - d4:32)(\! d4:32)( d4:32)(\< | -} -snareAC = \drummode { - d2->)\! d8 g16 d16 | - \flamd d2 d8. g16 | - d4:32( d4:32)( d4:32)(\> | - d2)\! \flamd d8. g16 | -} -snareAD = \drummode { - \flamd d2 d8 g16 d16 | - \flamd d2 \dragd d4 | - d4:32(\> d4:32)( d4:32)(\! | - d4:32)( d4:32)(\< d4:32)( -} \ No newline at end of file diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly deleted file mode 100755 index 0600314..0000000 --- a/airs/amazing_grace/side.ly +++ /dev/null @@ -1,34 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \part - \repeat volta 2{ - \line \break - \line \break - \line \break - \line \break - } - } - { - \snarePart - \snareAA - \snareAB - \snareAC - \snareAD - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily deleted file mode 100755 index 94eb300..0000000 --- a/airs/farewell_to_camraw/config.ily +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \eighthBeaming - } - -%% Format -formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } - -%% Headers -title = "Farewell to Camraw" -meter = "Slow Air" \ No newline at end of file diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly deleted file mode 100755 index 56172bd..0000000 --- a/airs/farewell_to_camraw/drums.ly +++ /dev/null @@ -1,50 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -%\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \global - << - \formatA - \snareA - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - %\bassA - %\bassB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - } - >> - \header { - title = \title - meter = \meter - composer = \markup \tiny { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily deleted file mode 100755 index da799f2..0000000 --- a/airs/farewell_to_camraw/notes.side.ily +++ /dev/null @@ -1,14 +0,0 @@ -% 4/4 Farewell to Camraw -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - r1 | - r1 | - \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | - \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | - \flamd d4 d32 g d g d g d g d4 r4 | - \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | - d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | - \flamd d8 \flamg g8 r4 r2 -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily deleted file mode 100755 index a109de9..0000000 --- a/airs/farewell_to_camraw/notes.tenor.ily +++ /dev/null @@ -1,15 +0,0 @@ -% 4/4 Farewell to Camraw -% Tenor -\version "2.18.2" -composerTenor = "" -tenorA = \drummode { - R1 - r8 g d16 g d g d8 g d16 g d g | - d8 g d16 g d g d4 d16 g d g | - d4 g16 d g d d4 r4 | - d4 d8 g d4 r4 | - d4 d8 g d4 r4 | - d8 g d g d4 d8 g | - d8 g r4 r2 | - -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly deleted file mode 100755 index 88a31ab..0000000 --- a/airs/farewell_to_camraw/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - \formatA - \snareA - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly deleted file mode 100755 index ce31ef0..0000000 --- a/airs/farewell_to_camraw/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - \formatA - \tenorA - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily deleted file mode 100755 index 9d30712..0000000 --- a/airs/flower_of_scotland/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Flower of Scotland" -meter = "Air" \ No newline at end of file diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily deleted file mode 100755 index b702d19..0000000 --- a/airs/flower_of_scotland/notes.side.ily +++ /dev/null @@ -1,26 +0,0 @@ -% 6/8 Flower of Scotland -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - g8 | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - - d4.:32( d4.) | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d8 g d | - - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - d4.:32( d4.) | - \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | - \flam d8 g16. d32 g16. g32 \flam d4 -} \ No newline at end of file diff --git a/airs/flower_of_scotland/side.ly b/airs/flower_of_scotland/side.ly deleted file mode 100755 index 05b1c0f..0000000 --- a/airs/flower_of_scotland/side.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { \repeat volta 2 { - \part - \repeat unfold 4 { \line \break } - } - } - { \snareA s8 } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/loch_duich/config.ily b/airs/loch_duich/config.ily deleted file mode 100755 index 21973bf..0000000 --- a/airs/loch_duich/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Loch Duich" -meter = "Slow Air" \ No newline at end of file diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily deleted file mode 100755 index 2c76ef3..0000000 --- a/airs/loch_duich/notes.side.ily +++ /dev/null @@ -1,46 +0,0 @@ -% 6/8 Loch Duich -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | -} -snareB = \drummode { - d4)\! g8 d8:32( d8) g8 | - d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | - - \flamg g4 g8 d8:32( d8) g8 | - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | - - \flamg g8 d8:32( d8) r8 d8:32( d8) | - \dragd d16 d-> g g \flamd d8 d4.:32(\< | -} -snareCA = \drummode { - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d8 g16 d-> g g d4.:32(\< | - - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 - d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | - - d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d4:32( d8) \dragd d16 d-> g g \flamd d8 | -} -snareCBA = \drummode { - \dragd d16 d-> g g \flamd d8 d4.:32(\< | -} -snareCBB = \drummode { - \dragd d16)\! d-> g g \flamd d8 \flamd d4. | -} \ No newline at end of file diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly deleted file mode 100755 index 1d78b2d..0000000 --- a/airs/loch_duich/side.ly +++ /dev/null @@ -1,33 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \line \break} - \repeat volta 2 { \line \break} - \repeat volta 2 { \halfline s2. s2.} - \alternative { - { s2.} {s2.} - } - } - { - \snareA - \snareB - \snareCA - \snareCBA - \snareCBB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/miss_kirkwood/config.ily b/airs/miss_kirkwood/config.ily deleted file mode 100755 index e722bbd..0000000 --- a/airs/miss_kirkwood/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Miss Kirkwood" -meter = "Slow Air" \ No newline at end of file diff --git a/airs/miss_kirkwood/notes.side.ily b/airs/miss_kirkwood/notes.side.ily deleted file mode 100755 index 949703e..0000000 --- a/airs/miss_kirkwood/notes.side.ily +++ /dev/null @@ -1,25 +0,0 @@ -% 6/8 Miss Kirkwood -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - d4.:32( d4) g8 | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - d2.:32(\< | - - d8)\! \flamg g8. g16 d4:32( d8) | - d8:32( d8.) g16 d4.:32( | - d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4.) -} -snareB = \drummode { - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | - \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | - d4:32( d8) g8 d8:32( d8) | - \flamd d8 g16 d16-> g16 g16 d4.:32(\< | - d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | - d4.:32( d4.) -} \ No newline at end of file diff --git a/airs/miss_kirkwood/side.ly b/airs/miss_kirkwood/side.ly deleted file mode 100755 index 12e7762..0000000 --- a/airs/miss_kirkwood/side.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 {\line \break} - \repeat volta 2 {\line \break} - } - { - \snareA - \snareB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly deleted file mode 100755 index 877f709..0000000 --- a/airs/morag_of_dunvegan/bass.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.bass.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\formatA \formatB} - {\bassA \bassB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentBass - composer = \composerBass - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily deleted file mode 100755 index b6ac8da..0000000 --- a/airs/morag_of_dunvegan/config.ily +++ /dev/null @@ -1,18 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } -formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } - -%% Headers -title = "Morag of Dunvegan" -meter = "Slow Air" - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly deleted file mode 100755 index aab186d..0000000 --- a/airs/morag_of_dunvegan/drums.ly +++ /dev/null @@ -1,51 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \global - << - { \formatA \formatB } - { \snareA \snareB } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \bassA - \bassB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - \tenorB - } - >> - \header { - title = \title - meter = \meter - composer = \markup \tiny { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.bass.ily b/airs/morag_of_dunvegan/notes.bass.ily deleted file mode 100755 index fc0d790..0000000 --- a/airs/morag_of_dunvegan/notes.bass.ily +++ /dev/null @@ -1,23 +0,0 @@ -% 6/8 Morag of Dunvegan -% Bass -\version "2.18.2" -bassA = \drummode { - d4. d8 r8 g8 | - d4. d8 g8 d8 | - d4. g8 d8 g8 | - d8 r8 g8 d4. | - d4. d8 r8 g8 | - d4. d8 g8 d8 | - d4. g8 d8 g8 | - d8 r8 g8 d4. | -} -bassB = \drummode { - d4. g4. | - d4. g4. | - d4. g8 d8 g8 | - d4 g8 d4. | - d4. g4. | - d4. g4. | - d4 g8 d4 g8 | - d8 g8 d8 g4. | -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.side.ily b/airs/morag_of_dunvegan/notes.side.ily deleted file mode 100755 index fac7c73..0000000 --- a/airs/morag_of_dunvegan/notes.side.ily +++ /dev/null @@ -1,30 +0,0 @@ -% 6/8 Morag of Dunvegan -% Tenor -\version "2.18.2" -snareA = \drummode { - \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | - - \flamd d8 d8:32( g8) \flamd d8 r8 d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | - g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | - - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) -} - -snareB = \drummode { - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - - d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | - - d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | - d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | - - \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | - d4.:32( d4.) -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.tenor.ily b/airs/morag_of_dunvegan/notes.tenor.ily deleted file mode 100755 index 6e5e020..0000000 --- a/airs/morag_of_dunvegan/notes.tenor.ily +++ /dev/null @@ -1,29 +0,0 @@ -% 6/8 Morag of Dunvegan -% Tenor -\version "2.18.2" -tenorA = \drummode { - d8 g8 d8 g8 d8 g8 | - d8 g8 d8 g4. | - - d8 r8 g8 d8 g8 d8 | - g8 r8 d8 g4. | - - d8 g8 d8 g8 d8 g8 | - d8 g8 d8 g4.| - - d4 g8 d4 g8 | - d8 g8 d8 g4. -} -tenorB = \drummode { - d8 g8 d8 g8 d8 g8 | - d4. g4. | - - d8 g8 d8 g8 d8 g8 | - d4 g8 d4.| - - d8 g8 d8 g8 d8 g8 | - d4. g4. | - - d8 g8 d8 g8 d8 g8 | - d8 g8 d8 g4. -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly deleted file mode 100755 index e51dc55..0000000 --- a/airs/morag_of_dunvegan/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\formatA \formatB} - {\snareA \snareB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly deleted file mode 100755 index aade5e1..0000000 --- a/airs/morag_of_dunvegan/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\formatA \formatB} - {\tenorA \tenorB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/airs/my_home/config.ily b/airs/my_home/config.ily deleted file mode 100755 index ad9fc49..0000000 --- a/airs/my_home/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "My Home" -meter = "Slow Air" \ No newline at end of file diff --git a/airs/my_home/drums.ly b/airs/my_home/drums.ly deleted file mode 100755 index 3eb253f..0000000 --- a/airs/my_home/drums.ly +++ /dev/null @@ -1,54 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { - \repeat volta 2 { \part \line \break} - \repeat volta 2 { \part \line \break} - } - { - \snareA s8 - \snareB s8 - } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \repeat unfold 2 { s8 \tenorA } - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/airs/my_home/notes.bass.ily b/airs/my_home/notes.bass.ily deleted file mode 100755 index 7eb7ef5..0000000 --- a/airs/my_home/notes.bass.ily +++ /dev/null @@ -1,6 +0,0 @@ -% 6/8 My Home -% Bass -\version "2.18.2" -composerBass = "" -bassA = \drummode { -} \ No newline at end of file diff --git a/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily deleted file mode 100755 index ca8b4b2..0000000 --- a/airs/my_home/notes.side.ily +++ /dev/null @@ -1,26 +0,0 @@ -% 6/8 My Home -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - d8:32( | - g8.) d16 g8 \flamd d8. g16 d8 | - \flamg g8. d16 g8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) -} -snareB = \drummode { - d8 | - \flamd d8. g16 d8 d4.:32( - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamg g8. d16 g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - \flamd d8. g16 d8 \flamg g8. d16 g8 | - d4.:32( d4) -} \ No newline at end of file diff --git a/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily deleted file mode 100755 index ab14c75..0000000 --- a/airs/my_home/notes.tenor.ily +++ /dev/null @@ -1,15 +0,0 @@ -% 6/8 My Home -% Tenor -\version "2.18.2" -composerTenor = "" -tenorA = \drummode { - d4 d8 g8. d16 g8 | - d4. g4 d8 | - d4. g4 d8 | - d8. g8 d16 d4.| - - d8. g16 d8 g4. | - d4 d8 g4. | - r8 g8 d8 r8 d8 g8 - d8 g8 d8 g4. -} \ No newline at end of file diff --git a/airs/my_home/side.ly b/airs/my_home/side.ly deleted file mode 100755 index b97df0f..0000000 --- a/airs/my_home/side.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \part \line \break} - \repeat volta 2 { \part \line \break} - } - { - \snareA s8 - \snareB s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/my_home/tenor.ly b/airs/my_home/tenor.ly deleted file mode 100755 index da4d91d..0000000 --- a/airs/my_home/tenor.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat volta 2 { \line \break} - \repeat volta 2 { \line \break} - - } - { - \repeat unfold 2 { \tenorA } - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily deleted file mode 100755 index cabb9bf..0000000 --- a/airs/the_mist_covered_mountains/config.ily +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -part = {\partial 8 s8 } -%% Format -formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } -formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } - -%% Headers -title = "The Mist Covered Mountains" -meter = "Slow Air" - -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly deleted file mode 100755 index 6e7918c..0000000 --- a/airs/the_mist_covered_mountains/drums.ly +++ /dev/null @@ -1,51 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -%\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \global - << - {\formatA \formatB } - {\snareA \snareB } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - %\bassA - %\bassB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - \tenorB - } - >> - \header { - title = \title - meter = \meter - composer = \markup \tiny { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily deleted file mode 100755 index bd59aa5..0000000 --- a/airs/the_mist_covered_mountains/notes.side.ily +++ /dev/null @@ -1,23 +0,0 @@ -\version "2.18.2" -snareA = \drummode { - \partial 8 d8:32( | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8[ r8 d8:32(] | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d8)[ r8 d8:32(] | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8 r8 d8:32( | - g8.) d16 g8 d8. g16 d8 | - d4.:32( d4.) | -} -snareB = \drummode { - \partial 8 d8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - d2.:32( | - d8.)-> g16 d8 g8 r8 g8 | - d2.:32( | - d8.)-> g16 d8 g8. d16 g8 | - r8 g8 d8 r8 d8 g8 | - d4.:32( d4.) | -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily deleted file mode 100755 index fe1b048..0000000 --- a/airs/the_mist_covered_mountains/notes.tenor.ily +++ /dev/null @@ -1,25 +0,0 @@ -% 6/8 The Mist Covered Mountains -% Tenor -\version "2.18.2" -tenorA = \drummode { - \partial 8 s8 - d4. g | - d4. g8 r8 g8 | - d4. g8. d16 g8 | - d8. g16 d8 g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - d4. g8. d16 g8 | - d8 g8 d8 g8 r4 -} -tenorB = \drummode { - \partial 8 s8 - d4. g | - d4. g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - d4. g | - d4. g8 r8 g8 | - r8. g16 d8 r8. d16 g8 | - d8 g8 d8 g8 r4 -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly deleted file mode 100755 index bcc942a..0000000 --- a/airs/the_mist_covered_mountains/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\formatA \formatB} - {\snareA \snareB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly deleted file mode 100755 index 9231675..0000000 --- a/airs/the_mist_covered_mountains/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\formatA \formatB} - {\tenorA \tenorB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/book/.gitignore b/book/.gitignore deleted file mode 100644 index 86753b4..0000000 --- a/book/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.pdf -*.aux -*.log -*.toc -images/* -scores/* -tmp/* diff --git a/book/bass_book.tex b/book/bass_book.tex deleted file mode 100644 index 52b951d..0000000 --- a/book/bass_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Scores Bass} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_bass.tex} -\end{document} diff --git a/book/clean b/book/clean deleted file mode 100644 index 936460e..0000000 --- a/book/clean +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rm -v *.log *.aux *.pyc diff --git a/book/drums_book.tex b/book/drums_book.tex deleted file mode 100644 index 5c0a96c..0000000 --- a/book/drums_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Drumscores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_drums.tex} -\end{document} diff --git a/book/full_book.tex b/book/full_book.tex deleted file mode 100644 index 6f171bc..0000000 --- a/book/full_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Fullscores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_full.tex} -\end{document} diff --git a/book/init b/book/init deleted file mode 100644 index 4e9ffc9..0000000 --- a/book/init +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -SHELLCMD='sh' -PYTHONCMD='python3.4' -LATEXCMD='pdflatex' - -#$SHELLCMD load_scores - -#$PYTHONCMD makebook -o tex/main_full.tex full -#$PYTHONCMD makebook -o tex/main_drums.tex drums -#$PYTHONCMD makebook -o tex/main_pipes.tex pipes -#$PYTHONCMD makebook -o tex/main_bass.tex bass -#$PYTHONCMD makebook -o tex/main_tenor.tex tenor -#$PYTHONCMD makebook -o tex/main_side.tex side snare - -for ins in tenor; -do - printf "\\documentclass{tex/score_book} - - \\title{Seaforth Highlanders of Holland\\\\ %s Scores} - \\author{Eric Teunis de Boone} - -\\begin{document} - -\\input{./tex/titlepage.tex} - -\\newpage -\\cleardoublepage -\\phantomsection -\\addcontentsline{toc}{section}{\contentsname} -\\begin{multicols}{2} - \\tableofcontents -\\end{multicols} - -%\\newpage -%\\input{./tex/playlist} -\\newpage -\\input{./tex/main_%s.tex} -\\end{document} -" "$instr" "$instr" -done; - -echo "All setup!" - -#read -p "Press [Enter] to compile *.tex" - -#for f in ./*.tex; -#do -# $LATEXCMD $f -#done; diff --git a/book/load_scores b/book/load_scores deleted file mode 100644 index 3bf4203..0000000 --- a/book/load_scores +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -MKDRUM_DIR="../" -MKDRUMCOMMAND=$MKDRUM_DIR"makedrum" -SCORES_DIR="./scores/" - -trap "echo Aborted!; exit;" SIGINT SIGTERM - -another_dir () { - d=$1 - for f in $d/* - do - if [ -d $f ]; then - another_dir $f - continue - fi - - if [ ! -f $f ]; then - continue - fi - - if [[ ! "$f" == *.ly ]]; then - continue - fi - - mkdir -p $SCORES_DIR${d/$MKDRUM_DIR} - #echo $SCORES_DIR${f/$MKDRUM_DIR} - $MKDRUMCOMMAND $f -d $SCORES_DIR${d/$MKDRUM_DIR} - done; -} - -for d in ${MKDRUM_DIR}*_marches ${MKDRUM_DIR}strathspeys ${MKDRUM_DIR}standards ${MKDRUM_DIR}jigs ${MKDRUM_DIR}airs ${MKDRUM_DIR}hornpipes ${MKDRUM_DIR}other -do - another_dir $d -done; diff --git a/book/makebook b/book/makebook deleted file mode 100644 index 5c8747b..0000000 --- a/book/makebook +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/python3.4 - -# To be Run: python3.4 makebook -v -o ./tex/main_pipes.tex pipes -# Uses a copy of the filestructure of pipeband-drumming to generate the body of a tex file - -import os -from argparse import ArgumentParser - -class MakeBook: - OUT = './tex/main.tex' - MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) - RUN_DIR = os.path.abspath(os.curdir) - SCORES_DIR = './scores/' - LY_DIR = '../' - ORDER_FILE = 'order.txt' - INSTRUMENTS = ['full','drums', 'pipes', 'bass', 'tenor', 'side','snare'] - def __init__(self): - - usage = __file__ - parser = ArgumentParser(usage) - parser.add_argument('-v','--verbose',default=False,action='store_true',dest='verbose', help='verbose') - parser.add_argument('instrument',default=False,nargs='*',help='Instruments to be included in the book') - parser.add_argument('-o','--output',default=self.OUT,help='Output file') - - self.args = parser.parse_args() - - if self.args.verbose: - self.vprint('Verbose output') - standards = ['standards'] - marches = ['2-4_marches', '3-4_marches', '4-4_marches', '5-4_marches', '6-8_marches'] - watch_folders = [ 'hornpipes', 'jigs', 'strathspeys', 'reels','other'] - watch_folders = marches + watch_folders - - # Run Path_walker over dirs - tune_dirs = [] - for d in watch_folders: - if d in marches: - continue - tune_dirs.append(d) - - # Ready f.out - try: - self.fout = open(self.args.output,'w+') - - self.fwrite(u'\\addcontentsline{toc}{section}{Standards}') - for d in standards: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=1) - self.fwrite(u'\\addcontentsline{toc}{section}{Marches}') - for d in marches: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=2) - - for d in tune_dirs: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d)) - except IOError: - print('Cannot open {}'.format(self.OUT)) - except: - self.fout.close() - raise - - def vprint(self,line = None): - if self.args.verbose: - if line is None: - line = '' - print(line) - - def fwrite(self,line): - self.fout.write(line+'\n') - - def include_pdf (self,file, level): - title = False - self.vprint(file) - lilydir = file[:file.rfind('/')].replace(self.SCORES_DIR,self.LY_DIR) - if os.path.isdir(lilydir): - path = file[:file.rfind('/')] - #Try to load title from config file - if os.path.isfile(os.path.join(lilydir,'config.ily')): - self.vprint('Loading config file') - with open(os.path.join(lilydir,'config.ily'),'r') as f: - for line in iter(f): - if line.startswith('title'): - title = line[line.find('=')+1:]#Strip 'title=' - title = title[1:-1] #Strip Quotes - continue - - lilyfile = os.path.join(lilydir, file[file.rfind('-')+1:].replace('.pdf','.ly')) - if not title and os.path.isfile(lilyfile): - self.vprint('Look through lilyfile') - with open(lilyfile, 'r') as f: - for line in iter(f): - if line.strip().startswith('title'): - title = line[line.find('=')+1:]#Strip 'title=' - title = title[1:-1] #Strip Quotes - continue - if title: - ref = title - forbid = ' /!@#$%^&*()<>?\|;:\'"' - for s in forbid: - ref = ref.replace(s,'_') - if not title: - self.vprint('No title yet Found!') - last_slash = file.rfind('/') - last_dot = file.rfind('.') - - if file[file.rfind('.',0,last_dot)+1:file.rfind('.')] in self.INSTRUMENTS: - ref = file[file.rfind('/')+1:file.rfind('.')] - else : - ref = file[file.rfind('/',0,last_slash-1)+1:file.rfind('.')].replace('/','-') - # Make title from filename - title = ref - #Remove references to Instruments - for inst in self.INSTRUMENTS: - title = title.replace('-'+inst, '') - title = title.replace('.'+inst, '') - #Remove chars - title = title.replace('-','').replace('_',' ').title() - - title = title[1:-1].replace('\\n',' ') - - if not self.args.instrument: - for inst in self.INSTRUMENTS: - if inst in file: - title = title + ' ('+inst+')' - self.vprint('= '+title) - ref = 'p'+ref.strip('_').lower() - #string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+','+title+','+ref+'}, pagecommand={}]{'+file+'}' - string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+',{'+title+'},'+ref+'}, pagecommand={}]{'+file+'}' - - self.fwrite(string) - return string - - def path_walker(self, a, level=None, content_line_level=None): - if not a: - return - if level is None: - level = 0 - if content_line_level is None: - content_line_level = 1 - # Do stuff - if level < content_line_level: - self.fwrite(u'\\mysection{'+('sub'*level)+'section}{'+a[a.rfind('/')+1:].replace('_',' ').replace('-','/').title()+'}') - newline = False - - if os.path.isfile(os.path.join(a, 'order.txt')): - self.vprint('Found order') - with open(os.path.join(a, self.ORDER_FILE)) as f: - line = f.readline().rstrip('\n') - while line: - self.path_walker(os.path.join(a,line), level+1) - line = f.readline().rstrip('\n') - else: - for root, dirs, files in os.walk(a,False): - for f in files: - if not f.endswith('.pdf'): - self.vprint('F! '+f) - continue - if self.args.instrument: - instr_in_file = False - for instr in self.args.instrument: - if instr in f: - self.vprint(instr) - instr_in_file = True - break - if not instr_in_file: - self.vprint('F! '+f) - continue - # Include file - self.vprint('F '+f) - if newline: - self.fwrite(u'\\newpage') - - newline = True - self.include_pdf(os.path.join(root,f), level+1) -# Run above -MakeBook(); diff --git a/book/pipes_book.tex b/book/pipes_book.tex deleted file mode 100644 index e0d65e6..0000000 --- a/book/pipes_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Pipe Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_pipes.tex} -\end{document} diff --git a/book/side_book.tex b/book/side_book.tex deleted file mode 100644 index f4fc484..0000000 --- a/book/side_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Side Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_side.tex} -\end{document} diff --git a/book/tenor_book.tex b/book/tenor_book.tex deleted file mode 100644 index ce5678b..0000000 --- a/book/tenor_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Tenor Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_tenor.tex} -\end{document} diff --git a/book/tex/main_bass.tex b/book/tex/main_bass.tex deleted file mode 100644 index 2062be1..0000000 --- a/book/tex/main_bass.tex +++ /dev/null @@ -1,17 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_drums.tex b/book/tex/main_drums.tex deleted file mode 100644 index 2529961..0000000 --- a/book/tex/main_drums.tex +++ /dev/null @@ -1,20 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_full.tex b/book/tex/main_full.tex deleted file mode 100644 index f7b6de8..0000000 --- a/book/tex/main_full.tex +++ /dev/null @@ -1,13 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_pipes.tex b/book/tex/main_pipes.tex deleted file mode 100644 index 06b3d59..0000000 --- a/book/tex/main_pipes.tex +++ /dev/null @@ -1,14 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_side.tex b/book/tex/main_side.tex deleted file mode 100644 index d3a0555..0000000 --- a/book/tex/main_side.tex +++ /dev/null @@ -1,58 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} -\mysection{subsection}{3/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} -\mysection{subsection}{6/8 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} -\mysection{section}{Hornpipes} -\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} -\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/book/tex/main_tenor.tex b/book/tex/main_tenor.tex deleted file mode 100644 index 1e034a4..0000000 --- a/book/tex/main_tenor.tex +++ /dev/null @@ -1,24 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/score_book.cls b/book/tex/score_book.cls deleted file mode 100644 index 635ca0e..0000000 --- a/book/tex/score_book.cls +++ /dev/null @@ -1,36 +0,0 @@ -\LoadClass{article} -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{score_book} -% -% Load packages -\RequirePackage[a4paper,margin=1in,landscape]{geometry} -\RequirePackage{pdfpages}%Includepdf -\RequirePackage{amsmath} -\RequirePackage{graphicx} -\RequirePackage{grffile} -\RequirePackage[dutch]{babel} -\RequirePackage{multicol}%Needed for toc -\RequirePackage{bookmark}%Needed for bookmark to toc -\RequirePackage{background} - \backgroundsetup{scale=0.7} - \backgroundsetup{angle=0} - \backgroundsetup{opacity=0.1} - \backgroundsetup{contents={\includegraphics[width=\textheight]{./images/seaforth_capbadge.jpg}}} -\RequirePackage{hyperref} - \hypersetup{colorlinks=false} -\RequirePackage{tocloft} -\PassOptionsToPackage{unicode}{hyperref} -\PassOptionsToPackage{naturalnames}{hyperref} -%\RequirePackage{chngpage} -% -% (Re)Set counters -\setcounter{secnumdepth}{-2}%Hides section no's -% -% Define commands -\newcommand{\mysection}[2]{ - \phantomsection - \stepcounter{#1} - \addtocontents{toc}{\cftpagenumbersoff{#1}}%cft for disabling page numbering - \addcontentsline{toc}{#1}{#2} - \addtocontents{toc}{\cftpagenumberson{#1}}%cft for enabling page numbering -} diff --git a/book/tex/titlepage.tex b/book/tex/titlepage.tex deleted file mode 100644 index 341ac10..0000000 --- a/book/tex/titlepage.tex +++ /dev/null @@ -1,6 +0,0 @@ -\NoBgThispage -\maketitle -\begin{center} -\includegraphics[width=0.3\textwidth]{./images/SEAFORTH_logo_PMS.pdf} -\end{center} - diff --git a/build_all b/build_all deleted file mode 100755 index 1d8b2ac..0000000 --- a/build_all +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -MKDRUMCOMMAND="./makedrum" - -for d in *_marches strathspeys standards jigs airs hornpipes other -do - for f in $d/*.ly $d/*/*.ly - do - if [ ! -f $f ] ; then - continue - fi - $MKDRUMCOMMAND $f - done; -done; diff --git a/cheatsheet.ly b/cheatsheet.ly index 4f52497..cc03f66 100755 --- a/cheatsheet.ly +++ b/cheatsheet.ly @@ -98,7 +98,28 @@ "d8:32(" "\\triplet " -- "\\flam d16." "g32" -- "\\drag g16" -- "\\triplet" "g:64" "d-> }" } } - +\score { + \new PipeBandDrumStaff { + \drummode { + \time 6/8 + \repeat volta 2 { + \partial 8 d8:32(_"7" | + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \flamddr d8. d16 g8 d4.:32(_"13" | + d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | + \break + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | + d8.:32(_"5" d16) \flamg g8 \flamd d4 \fr | + } + } + } + \header { + title = "And now for something completely standard" + } +} % # Writing parts % rolls % tuplets diff --git a/example.ly b/example.ly deleted file mode 100755 index ff1c9f1..0000000 --- a/example.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.18.2" -% include the lilydrum file -\include "lilydrum.ly" - -% Now a tiny example : -\score { - \new DrumStaff { - \drummode { - \time 6/8 - \partial 8 d8:32(_"7" | - \repeat volta 2 { - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16 g8 d4.:32(_"13" | - d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | - \break - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | - d8.:32(_"5" d16) \flamg g8 \flamd d4. \fr | - } - } - } -} \ No newline at end of file diff --git a/header_book.ily b/header_book.ily deleted file mode 100755 index 6e0e8e1..0000000 --- a/header_book.ily +++ /dev/null @@ -1,42 +0,0 @@ -%{ - Header formatting for tunes. Customize to get your name in the tag line. -%} - -\version "2.16.0" - -today = #(strftime "%B %e, %Y" (localtime (current-time))) - -\paper { - raggedbottom = ##t - tagline = \markup { - \line { - "Cpl ET de Boone, Seaforths of Holland," - \concat { "(rev. " \today ")" } - } - } - bookTitleMarkup = \markup { - \override #'(baseline-skip . 3.5) - \column { - \fill-line { \fromproperty #'header:dedication } - \override #'(baseline-skip . 3.5) - \column { - \huge \larger \bold - \fill-line { - \larger \fromproperty #'header:title - } - \fill-line { - \large \smaller \bold - \larger \fromproperty #'header:subtitle - } - \fill-line { - \smaller \bold - \fromproperty #'header:source - } - \fill-line { - \line { \fromproperty #'header:meter } - \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } - } - } - } - } -} diff --git a/header_default.ily b/header_default.ily deleted file mode 100755 index e14d07b..0000000 --- a/header_default.ily +++ /dev/null @@ -1,39 +0,0 @@ -%{ - Header formatting for tunes. Customize to get your name in the tag line. -%} - -\version "2.16.0" - -today = #(strftime "%B %e, %Y" (localtime (current-time))) - -\paper { - tagline = \markup { - \line { - "Cpl ET de Boone, Seaforths of Holland," - \concat { "(rev. " \today ")" } - } - } - scoreTitleMarkup = \markup { - \override #'(baseline-skip . 3) - \column { - \fill-line { - \column { - \large \bold \fromproperty #'header:title - \bold \fromproperty #'header:subtitle - } - \fromproperty #'header:meter - \column \right-align { - \fromproperty #'header:instrument - \line { - \fromproperty #'header:composer - $(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger)) - (markup " ")) - \italic \fromproperty #'header:arranger } - } - } - $(if (not (ly:get-option 'without-comment)) - (markup #:justify-field 'header:comment) - (markup)) - } - } -} diff --git a/hornpipes/itchy_fingers/config.ily b/hornpipes/itchy_fingers/config.ily deleted file mode 100755 index 33db2fe..0000000 --- a/hornpipes/itchy_fingers/config.ily +++ /dev/null @@ -1,15 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 2/4 - \eighthBeaming - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Itchy Fingers" -meter = "Hornpipe" \ No newline at end of file diff --git a/hornpipes/itchy_fingers/notes.side.ily b/hornpipes/itchy_fingers/notes.side.ily deleted file mode 100755 index 3babef6..0000000 --- a/hornpipes/itchy_fingers/notes.side.ily +++ /dev/null @@ -1,35 +0,0 @@ -% 2/4 Itchy Fingers -% Side -\version "2.18.2" -composerSide = "Dean Hall, 1995" -snareAA = \drummode { - \flamd d16-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> d8:32( | - - g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | - d16) g16-> d32 g d g d4:32( | -} -snareAB = \drummode { - \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | - d16 \flamg g-> d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> -} - -snareBA = \drummode { - d16 g16 | - d32-> g d g d g d g d16-> g d d | - g32-> d g d g-> d g d g16-> d g g | - - d32-> g d g d g d-> g d g d g d8-> | - d16-> d16:64( d16) g16 d4:32(-> | -} - -snareBBA = \drummode { - d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | - d16 g16-> d32 g d g d8-> \flamd d16-> g16 | - - d32 g d g d16-> g16 d16 d16:64( d16) g16 | - d8:32(-> g8:32)(-> d8)-> -} \ No newline at end of file diff --git a/hornpipes/itchy_fingers/side.ly b/hornpipes/itchy_fingers/side.ly deleted file mode 100755 index e71eb1f..0000000 --- a/hornpipes/itchy_fingers/side.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { \repeat volta 2 {\line \break} - \repeat volta 2 {\part \halfline \break} - \alternative { {\halfline \break} {\halfline \break } } - } - { \snareAA \snareAB s8 - \snareBA - \snareBBA s8 - \snareAB s8 - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/config.ily b/jigs/seaforth_sticks/config.ily deleted file mode 100755 index 74af3c4..0000000 --- a/jigs/seaforth_sticks/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 6/8 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s2. | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Seaforth Sticks" -meter = "Jig" \ No newline at end of file diff --git a/jigs/seaforth_sticks/drums.ly b/jigs/seaforth_sticks/drums.ly deleted file mode 100755 index a0ee950..0000000 --- a/jigs/seaforth_sticks/drums.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { - \repeat unfold 8 { - \mark \default - \repeat volta 2 { - \part - \line - } - \break - } - }%Format - { - \snareA - \snareB - \snareC - \snareD - \snareE - \snareF - \snareG - \snareH - } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.bass.ily b/jigs/seaforth_sticks/notes.bass.ily deleted file mode 100755 index ad900bf..0000000 --- a/jigs/seaforth_sticks/notes.bass.ily +++ /dev/null @@ -1,6 +0,0 @@ -% 6/8 Seaforth Sticks -% Bass -\version "2.18.2" -composerBass = "" -bassA = \drummode { -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily deleted file mode 100755 index 6d87e50..0000000 --- a/jigs/seaforth_sticks/notes.side.ily +++ /dev/null @@ -1,123 +0,0 @@ -% 6/8 Seaforth Sticks -% Side -\version "2.18.2" -composerSide = "" -snareA = \drummode { - r8 | - \flamd d8 g8 d8 \flamg g4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \flamg g4 g8 | - d4.:32(-> d8) g8 g8 | - - \flamd d8 g8 d8 \flamg g4 g8 | - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) -} -%B -snareB = \drummode { - g8 | - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8 d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ g8 | - - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) -} -%C -snareC = \drummode { - d8:32( | - d4) \flamd d8 g8 d8 g8-^| - d16 g d g d8 g8 d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | - d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | - - d4) \flamd d8 g8 d8 g8-^| - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) -} -%D -snareD = \drummode { - g8 | - d4.:32(-> d8) g8 g8| - d4.:32(-> d8) g8 g8| - - \flamd d8 g8 d8 \flamg g4 g8-^ | - d8 g8 \flamg g8-^ \flamg g4 g8 | - - d4.:32(-> d8) g8 g8| - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> g8 d8 g8 | - d4.:32( d4.) -} -%E -snareE = \drummode { - r8 | - \flamd d8 g8 d8 \backstick d4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d4.:32(-> d8) g8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - d4.:32( d4.) -} -%F -snareF = \drummode { - g8 | - d4.:32(-> d4.:32)(-> | - d16) g d g d8-> g8^"Y" d8 g8 | - - \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | - - d4.:32(-> d8) g8 g8 | - d16 g d g d8-> g8 d8 g8 | - - d16 g d g d8-> db4 g8 | - d4.:32( d4.) -} -%G -snareG = \drummode { - d8:32( | - d4)-^ \backstick d8 g8 d8 g8-^| - d16 g d g d8 g8 d8 g8 | - - \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 g8 g8 \backstick d4 d8:32( | - - d4)-> \backstick d8 g8 d8 g8| - d16 g d g d8-> g8 d8 g8 | - - \flamd d8 g d8-> \backstick d4 g8 | - d4.:32( d4.) -} -%H -snareH = \drummode { - g8 | - \flamd d8 d16 g16 d8 \repeat unfold 3 { \crossstick sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| - - \flamd d8 g8 d8 \backstick d4 g8 | - \flamd d8 g8 d8 \backstick d4 g8 | - - \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| - \flamd d8 g8 d8 g8^"Y" d8 g8| - - \flam d8 g8 d8 \backstick d4 g8 | - d4.:32( d4.) -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.tenor.ily b/jigs/seaforth_sticks/notes.tenor.ily deleted file mode 100755 index 27cfe63..0000000 --- a/jigs/seaforth_sticks/notes.tenor.ily +++ /dev/null @@ -1,6 +0,0 @@ -% 6/8 Seaforth Sticks -% Tenor -\version "2.18.2" -composerTenor = "" -tenorA = \drummode { -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/side.ly b/jigs/seaforth_sticks/side.ly deleted file mode 100755 index c91b947..0000000 --- a/jigs/seaforth_sticks/side.ly +++ /dev/null @@ -1,38 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat unfold 8 { - \mark \default - \repeat volta 2 { - \part - \line - } - \break - } - } - { - \snareA - \snareB - \snareC - \snareD - \snareE - \snareF - \snareG - \snareH - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly deleted file mode 100755 index e12bc43..0000000 --- a/jigs/seaforth_sticks/tenor.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat unfold 8 { - \mark \default - \repeat volta 2 { - \part - \line - } - \break - } - } - {} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly index f905bcd..ee38e94 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -27,8 +27,8 @@ #(ly:set-option 'point-and-click #f) #(ly:set-option 'relative-includes #t) -\include ".lilydrum/layout_tweaks.ily" -\include ".lilydrum/musical_functions.ily" -\include ".lilydrum/embellishments.ily" -\include ".lilydrum/flourishing.ily" -\include ".lilydrum/special_sticking.ily" +\include "lilydrum/layout_tweaks.ily" +\include "lilydrum/musical_functions.ily" +\include "lilydrum/embellishments.ily" +\include "lilydrum/flourishing.ily" +\include "lilydrum/special_sticking.ily" diff --git a/.lilydrum/embellishments.ily b/lilydrum/embellishments.ily old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/embellishments.ily rename to lilydrum/embellishments.ily diff --git a/.lilydrum/flourish_symbols/butterfly.eps b/lilydrum/flourish_symbols/butterfly.eps old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/flourish_symbols/butterfly.eps rename to lilydrum/flourish_symbols/butterfly.eps diff --git a/.lilydrum/flourish_symbols/st_andrews_crss.eps b/lilydrum/flourish_symbols/st_andrews_crss.eps old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/flourish_symbols/st_andrews_crss.eps rename to lilydrum/flourish_symbols/st_andrews_crss.eps diff --git a/.lilydrum/flourish_symbols/stop.eps b/lilydrum/flourish_symbols/stop.eps old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/flourish_symbols/stop.eps rename to lilydrum/flourish_symbols/stop.eps diff --git a/.lilydrum/flourishing.ily b/lilydrum/flourishing.ily old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/flourishing.ily rename to lilydrum/flourishing.ily diff --git a/.lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/layout_tweaks.ily rename to lilydrum/layout_tweaks.ily diff --git a/.lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/musical_functions.ily rename to lilydrum/musical_functions.ily diff --git a/.lilydrum/special_sticking.ily b/lilydrum/special_sticking.ily old mode 100755 new mode 100644 similarity index 100% rename from .lilydrum/special_sticking.ily rename to lilydrum/special_sticking.ily diff --git a/makedrum b/makedrum index 7458a22..549a7e9 100755 --- a/makedrum +++ b/makedrum @@ -34,6 +34,9 @@ class MakeDrum: parser.add_argument('-c', '--pipefile', dest='lilypipe', default='bagpipe.ly', help='Use the specified file for pipes') + parser.add_argument('-i', '--include', + dest='includes', nargs='*', default=[],action='append', + help='Include the specified file for compiling') parser.add_argument('-p', '--paper-size', dest='papersize', default='a4', @@ -44,9 +47,6 @@ class MakeDrum: parser.add_argument('-s', '--staff-size', dest='staffsize', default='20', help='Staff size. Default: 16pt.') - parser.add_argument('-f', '--format', - dest='format', default=None, - help='Use header format file "header_{format}". Default: "header_default"') parser.add_argument('-w', '--view-spacing', action='store_true', dest='view_spacing', default=False, help='Turn on "Paper.annotatespacing".') @@ -92,11 +92,14 @@ class MakeDrum: if self.args.list_file != '': self.args.music_file.append(open(self.args.list_file, 'r').readlines()) close(self.args.list_file) + # Check for files if not self.args.music_file: parser.print_usage() return + # Check for files to include + self.args.includes = [el for elements in self.args.includes for el in elements] # Clean up of files self.remove_tmp_dir = self.args.clean @@ -122,15 +125,7 @@ class MakeDrum: os.chdir(self.RUN_DIR) def processit(self, tmp_dir, file, gen_out, compile): - if self.args.format is None: - if file.endswith(".book"): - header_format = "header_book" - else: - header_format = "header_default" - else: - header_format = "header_" + self.args.format - - tmp_file = self.maketemplate(tmp_dir, file, header_format) + tmp_file = self.maketemplate(tmp_dir, file) if gen_out is not None and gen_out != tmp_dir: new_tmp_file = os.path.basename(tmp_file).replace(self.TMP_PREFIX, ''); @@ -176,7 +171,7 @@ class MakeDrum: os.remove(logfile) os.remove(tmp_file) - def maketemplate(self, tmp_dir, file, header_format): + def maketemplate(self, tmp_dir, file): lily_includes = '' include_drum_file = False include_pipe_file = False @@ -184,17 +179,21 @@ class MakeDrum: for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: if ext in file: include_drum_file = True + break + for ext in ['full', 'pipes']: if ext in file: include_pipe_file = True + break + if include_drum_file: - lily_includes = lily_includes + u""" -\\include \""""+self.args.lilydrum+"""\" -""" + self.args.includes.insert(0,self.args.lilydrum) + if include_pipe_file: - lily_includes = lily_includes + u""" -\\include \""""+self.args.lilypipe+"""\" -""" + self.args.includes.insert(0, self.args.lilypipe) + + for f in self.args.includes: + lily_includes = lily_includes + "\n\\include \"{}\"".format(f) # set up a tmp file with template and file combined tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-')) @@ -210,11 +209,17 @@ class MakeDrum: #(ly:set-option 'point-and-click #f) """+ lily_includes +""" -\\include \""""+os.path.join(os.path.abspath(self.MASTER_DIR), header_format.strip(".ily")+""".ily""")+"""\" #(set-global-staff-size """+self.args.staffsize+""") #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") +%\layout { +% \context { +% \Score { +% \override NonMusicalPaperColumn #'line-break-permission = ##f +% } +% } +%} % The tune to generate. """) diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly deleted file mode 100755 index f465711..0000000 --- a/other/band_of_brothers.snare.ly +++ /dev/null @@ -1,128 +0,0 @@ -\version "2.18.2" - -#(set-default-paper-size "a4" 'landscape) -#(set-global-staff-size 19) -\layout { - indent = 0 - \set Score.markFormatter = #format-mark-box-alphabet - \context { - \DrumStaff - % one line per staff - \override StaffSymbol.line-positions = #'(0) - \numericTimeSignature - } -} -\score { - \new DrumStaff = "staff_snare" { - \drummode { - \compressMMRests { - \tempo 2. = 32 - \time 3/4 - \override MultiMeasureRest.expand-limit = #3 - R2.*4 - } - \compressMMRests { - \bar "||" - \mark \default - R2.*35 - } - \bar "||" - \tempo 4 = 108 - \mark \default - \time 4/4 - sn4 \f \tuplet 3/2 {r8 sn8 sn8 } r4 sn4 | - \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | - \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 - - | - \time 2/4 - - sn2:16( - - | - \time 4/4 - - \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8} \tuplet 3/2 { sn8 sn8 sn8} - - \bar "||" - \mark \default - \repeat percent 7{ - \grace sn8 sn4 \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | - \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | - } - - \grace sn16 \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | - sn8 r8 r4 sn2:32( | - \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | - sn8 r8 r4 \grace {sn16 sn16} sn4 \grace {sn16 sn16} sn4 | - - \bar "||" - \mark \default - \repeat percent 10 { - \grace {sn16} sn4 \mf \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 { sn8 sn8 sn8} | - } - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | - \tuplet 3/2 { sn4 \mf\< sn8 } - \tuplet 3/2 { r8 sn8 sn8 } - \tuplet 3/2 { sn4 sn8 } - \tuplet 3/2 { sn8 sn8 sn8 \! } - | - - \grace { sn16 sn sn sn} \tuplet 3/2 { sn4 \f sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | - sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | - - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | - sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | - sn1:32( - - \bar "||" - \mark \default - sn8) \f r8 r4 r2 | - \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - \grace {sn16} sn8 r8 r4 r2 - \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - - \bar "||" - \mark \default - - \repeat percent 3 { - \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - } - \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } \grace sn16 \tuplet 3/2 { sn8 sn sn} | - \repeat percent 3 { - \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - } - \tuplet 3/2 {sn4 \< sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - - \tuplet 3/2 { sn4 \ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } - sn8 r8 r4 r2 | - - \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | - \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn sn } - \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | - sn8 r8 r4 \tuplet 3/2 { sn4 sn sn } | - \tuplet 3/2 { sn4 \fp\< sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - - \bar "||" - \tuplet 3/2 { sn4\ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | - sn8 r8 r4 sn4:32( sn4:32)( | - \tuplet 3/2 { sn8) sn8 r8 } \tuplet 3/2 { r8 sn8 sn8 } sn8 r8 r4 - } - } - \header { - title = "Band of Brothers" - subtitle = "for the Edinburgh Military Tattoo 2005" - arranger = "Michael Kamen, arr. Richard Barriball" - instrument = "Snare Drum" - meter = "" - } - -} - - diff --git a/standards/24_standards.side.ly b/standards/24_standards.side.ly deleted file mode 100755 index 52cf461..0000000 --- a/standards/24_standards.side.ly +++ /dev/null @@ -1,73 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 2/4 - - \drummode { - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - \break - % LINE 4 - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - }% End of drums % - } - \header { - title = "2/4 Standards" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/34_standards1.side.ly b/standards/34_standards1.side.ly deleted file mode 100755 index 2a6fed6..0000000 --- a/standards/34_standards1.side.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 3/4 - - \drummode { - \repeat volta 2{ - \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 - \flamd d4 d4:32( d4) - } - }% End of drums % - } - \header { - title = "3/4 Standards\nSetting 1" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/34_standards2.side.ly b/standards/34_standards2.side.ly deleted file mode 100755 index 5d49f3a..0000000 --- a/standards/34_standards2.side.ly +++ /dev/null @@ -1,61 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 3/4 - - \drummode { - \repeat volta 2{ - d4:32(-> d8) d8:32(-> d4) | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - d4:32(-> d8) d8:32(-> d4) | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - d4:32( g8) d8:32( g8) g8 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - d4:32( g8) d8:32( g8) g8 | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | - \flamd d4 d4:32( d4) - } - }% End of drums % - } - - \header { - title = "3/4 Standards\n Setting 2" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/34_standards3.side.ly b/standards/34_standards3.side.ly deleted file mode 100755 index f3f2e1b..0000000 --- a/standards/34_standards3.side.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 3/4 - - \drummode { - \repeat volta 2{ - \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | - d8) d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | - d4) d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) \flamg g8 d16 d d d | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) \flamg g8 d16 d d d - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | - \flamd d4 d4:32( d4) - } - - \break - \repeat volta 2{ - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | - \flamd d4 d4:32( d4) - } - \break - \repeat volta 2{ - \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | - \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | - \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | - \flamd d4 d4:32( d4) - } - }% End of drums % - } - - \header { - title = "3/4 Standards\n Setting 3" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly deleted file mode 100755 index 6f779cd..0000000 --- a/standards/44_standards.side.ly +++ /dev/null @@ -1,93 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 2/4 - - \drummode { - \repeat volta 2{ - \partial 8 r8 | - R1 | - r4 r8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | - d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - R1 | - r4 r8 d8:32( | - g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | - \flamd d8 d8:32( g8) - } - }% End of drums % - } - - \header { - title = "2/4 Standards" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} -\score { - \new PipeBandDrumStaff { - \eighthBeaming - \time 4/4 - \drummode{ - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | - \flamd d4 d4:32( d4) r8 - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 g8 | - \flamd d4 d4:32( d4) r8 - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8 | - \flamd d4 d4:32( d4) r8 - } - \break - % LINE 4 - \repeat volta 2{ - \partial 8 d16. g32 | - \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 g8 | - \flamd d4 d4:32( d4) r8 - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 g8 | - \flamd d4 d4:32( d4) r8 - } - \break - \repeat volta 2{ - \partial 8 d16. g32 | - \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | - \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | - \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 g8 | - \flamd d4 d4:32( d4) r8 - } - }% End of drums % - } - - \header { - title = "4/4 Standards" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly deleted file mode 100755 index b08a5ab..0000000 --- a/standards/68_standards.side.ly +++ /dev/null @@ -1,90 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2{ - \partial 8 g8 | - \flamd d4 d8:32( g4) d8:32( | - g8.) g16 d8 \flamd d8. g16 d8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - \flamd d4 d8:32( g4) d8:32( | - g8.) g16 d8 \flamd d8. g16 d8 | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - \break - \repeat volta 2{ - \partial 8 g8 | - d8:32( d8) g8 d8:32( d8) g8 | - \flamd d8 d8:32( d8) d8:32( d8) g8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d8:32( d8) g8 d8:32( d8) g8 | - \flamd d8 d8:32( d8) d8:32( d8) g8 | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - \break - \repeat volta 2{ - \partial 8 g8 | - d4.:32(\< d4.:32)( | - d8.)\! g16 d8 \flamd d8. g16 d8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d4.:32(\< d4.:32)( | - d8.)\! g16 d8 \flamd d8. g16 d8 | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - \break - \repeat volta 2{ - \partial 8 d8:32( | - g8.) g16 \flamd d8 d8. d16 \flamg g8 | - d8. g16 \flamd d8 \flamd d8. g16 d8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8:32( | - g8.) g16 \flamd d8 d8. d16 \flamg g8 | - d8. g16 \flamd d8 \flamd d8. g16 d8 | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - \break - \repeat volta 2{ - \partial 8 d8:32( | - \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | - \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 d8:32( | - \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | - \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - \break - \repeat volta 2{ - \partial 8 g8 | - d4.:32(\< d4.:32)( | - d16)\!\< g d g d8\! \flamd d8. g16 d8 | - \flamd d8. g16 d8 d4.:32( | - d8.) g16 d8 \flamd d4 g8 | - d4.:32(\< d4.:32)( | - d16)\!\< g d g d8\! \flamd d8. g16 d8 | - \flamd d8. d16:64( d8) d4.:32( | - d8.) g16 d8 \flamd d4 - } - }% End of drums % - } - - \header { - title = "6/8 Standards" - meter = "Quick March" - composer = "" - instrument = "Side" - } -} \ No newline at end of file diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly deleted file mode 100755 index 65d30de..0000000 --- a/standards/standards.bass.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\header { - title = "Standards" - instrument = "Bass" - } - -\score { - \new PipeBandDrumStaff { - \time 2/4 - \drummode { - \repeat volta 2 { - \repeat unfold 8 { d4-> g4 } - } - } - } - \header { - title = "2/4 Standard" - } -} -\score { - \new PipeBandDrumStaff { - \time 3/4 - - \drummode { - \repeat volta 3 { - \repeat unfold 8 { d4-> g4 g4 } - } - } - } - \header { - title = "3/4 Standard" - } -} -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - \repeat unfold 8 { d4\v g4 d4-> g4} - } - } - } - \header { - title = "4/4 Standard" - } -} -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \repeat unfold 8 { d4. g4. } - } - } - } - \header { - title = "6/8 Standard" - } -} \ No newline at end of file diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly deleted file mode 100755 index 41cdf81..0000000 --- a/standards/standards.tenor.ly +++ /dev/null @@ -1,132 +0,0 @@ -\version "2.18.2" - -\include "lilydrum.ly" - -\header { - instrument = "Tenor" - title = "Standards" -} - -\score { - \new PipeBandDrumStaff { - \time 2/4 - - \drummode { - \repeat volta 2 { - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d8-> g d g | - d4-> r | - \bar "||" - \break - \flourish { - d4 d | - g4 g | - d4 d | - g4 g | - d4 d | - g4 g | - d4 d | - g4 d | - } - } - } - } - - \header { - title = "2/4 Standards" - } -} - -\score { - \new PipeBandDrumStaff { - \time 3/4 - - \drummode { - \repeat volta 2 { - d8.-> g16 d8 g r g | - d4-> d8 g d4 | - d8.-> g16 d8 g r g | - d4-> d8 g d4 | - \bar "||" - \break - \flourish{ - d4-> d d | - g4-> g g | - d4-> d g | - g4-> d g | - } - } - } - } - - \header { - title = "3/4 Standards" - } -} - -\score { - \new PipeBandDrumStaff { - \time 4/4 - - \drummode { - \repeat volta 2 { - d8-^ g d g d-> g d g | - d8-^ g d g d-> g d g | - d8-^ g d g d-> g d g | - d4-^ g d r | - \bar "||" - \break - \flourish { - d4 d g g | - d4 d g g | - d4 d g g | - } - \flourish d4 \flourish g d^\splitTheFeather r | - } - } - } - - \header { - title = "4/4 Standards" - } -} - -\score { - \new PipeBandDrumStaff { - \time 6/8 - - \drummode { - \repeat volta 2 { - \flourish d4. \flourish g | - d^\splitTheFeather r | - d g | - d8 r8 g8 d4. | - \flourish d4. \flourish g | - d^\splitTheFeather r | - d g | - d8 r8 g8 d4. | - \bar "||" - \break - \flourish { - d4. d | - g g | - d d | - g g | - d d | - g g | - d g | - } - d^\splitTheFeather r | - } - } - } - - \header { - title = "6/8 Standards" - } -} diff --git a/strathspeys/aa_camerons/config.ily b/strathspeys/aa_camerons/config.ily deleted file mode 100755 index 2f9ab87..0000000 --- a/strathspeys/aa_camerons/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 2 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "A. A. Cameron's Strathspey" -meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/aa_camerons/notes.side.ily b/strathspeys/aa_camerons/notes.side.ily deleted file mode 100755 index d5cf8fd..0000000 --- a/strathspeys/aa_camerons/notes.side.ily +++ /dev/null @@ -1,30 +0,0 @@ -% 4/4 A. A. Cameron's Strathspey -% Side -\version "2.18.2" -composerSide = "G. Clark, 1988" -snareAA = \drummode { - \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8.[ \dragd d16] \tuplet 3/2 { d16 g d g d8 } g4:32(-> | - d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8[ g8 \dragd d8] } \tuplet 3/2 { d16 g d g d8 } | -} -snareABA = \drummode { - g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | - \flamd \tuplet 3/2 { d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } -} -snareABB = \drummode { - g8.-> g16 \tuplet 3/2 { d16[-> g d g \dragd d8] } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | - \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } -} - -% Part 2 -snareBA = \drummode { - d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | - d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | -} -snareBBA = \drummode { - \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | - g8. d16 \flamg \tuplet 3/2 { g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } -} -snareBBB = \drummode { - \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | - d8.) g16 \flamd \tuplet 3/2 { d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } -} \ No newline at end of file diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly deleted file mode 100755 index c23854f..0000000 --- a/strathspeys/aa_camerons/side.ly +++ /dev/null @@ -1,39 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { - \repeat unfold 2 { - \repeat volta 2 { \halfline } - \alternative { - {\halfline} - {\halfline } - } - \break - } - \bar "|." - } - { - \snareAA - \snareABA - \snareABB - - - \snareBA - \snareBBA - \snareBBB - } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly deleted file mode 100755 index 649db5e..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/bass.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.bass.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \line } \break \line \break \line \bar "|."} - {\bassA \bassBA \bassBB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentBass - composer = \composerBass - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily deleted file mode 100755 index 685b8f8..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/config.ily +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 16 s16 } -line = { \repeat unfold 4 { s1 | } } - -%% Headers -title = "Lady MacKenzie of Fairburn" -meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly deleted file mode 100755 index fe6eee2..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/drums.ly +++ /dev/null @@ -1,51 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { \repeat volta 2 {\line } \break \part \line \break \line \bar "|."} - { \snareA s16 \snareBA \snareBB } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \bassA - s16 \bassBA \bassBB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - s16 \tenorBA \tenorBB - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly deleted file mode 100755 index ffcdbce..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/full.ly +++ /dev/null @@ -1,64 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" -\include "notes.pipes.ily" - -\score { - \new StaffGroup << - \new Staff { - \global - \bagpipeKey - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } - << - { \repeat volta 2 { \part \line } - \break \part \line \bar "||" - \break \line \bar "|." - } - {\pipesA s16 \pipesBA \pipesBB} - >> - } - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - s16 \snareA - s16 \snareBA \snareBB - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - s16 \bassA - s16 \bassBA \bassBB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - s16 \tenorA - s16 \tenorBA \tenorBB - } - >> - \header { - title = \title - meter = \meter - composer = \markup \large { - \column \right-align { - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) - $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) - $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily deleted file mode 100755 index 635f277..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily +++ /dev/null @@ -1,25 +0,0 @@ -% 4/4 Lady MacKenzie of Fairburn -% Bass -\version "2.18.2" -composerBass = "E.T. de Boone, v0.8, 2015" -bassA = \drummode { - bd4 bd4-> r4 bd4 - | - bd4-> r4 bd4 r4 - | - bd4-> bd4 r4 bd4 - | - bd4 r4 bd4-> bd4 -} -bassBA = \drummode { - bd4 r4 bd4 bd | - bd4 r4 bd4 r4 | - bd4 bd4 bd4 bd | - bd8 bd8 r8 bd8 r8 bd8 bd4 | -} -bassBB = \drummode { - bd4 r4 bd4 bd | - bd4 r4 bd4 r4 | - bd4 bd4 bd8 bd8 r4 | - bd8 bd8 r8 bd8 r8 bd8 bd4 | -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily deleted file mode 100755 index 27f092d..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily +++ /dev/null @@ -1,70 +0,0 @@ -% 4/4 Lady MacKenzie of Fairburn -% Pipes -\version "2.18.2" -composerPipes = "J. Wark, arr. R. Stanley" -pipesA = { - d16 | - \dblc c8. e16 - \dblA A4 - g16 f16 e8 - \dblA A4 - | - \hdblc c8. e16 - \dblA A8. d16 - \dblc c8. b16 - \grg a8. d16 - | - \dblc c8. e16 - \dblA A4 - g16 f e8 - \dblg g4 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg a8. -} -pipesBA = { - d16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble e8. d16 - \dblc c8. b16 - \grg a8. A16 - | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. -} -pipesBB = { - A16 | - a8. \grd c16 - \dble e8. a16 - \grg f8. a16 - \dble e4 - | - \grg a8. \grd c16 - \dble d8. d16 - \dblc c8. b16 - \grg a16 A8. - | - a8. \grd c16 - \grg e16 A8. - \hdblf g16 d8. - \dble e8. c16 - | - \thrwd d8. e16 - \dblg g8. d16 - \dblb b8. a16 - \grg G8. -} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily deleted file mode 100755 index 95e0700..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily +++ /dev/null @@ -1,69 +0,0 @@ -% 4/4 Lady MacKenzie of Fairburn -% Side -\version "2.18.2" -composerSide = "E.T. de Boone, v0.9, 2015" -snareA = \drummode { - \flam d8. g16 - d8.:32( g16) - \flamd \triplet { d8 \dr \< g16 g d8 } - \flam g8.-> \! \fr \parenthesize g16 - | - \triplet { d16 g d g d8 } - \triplet { g8-> d g-> } - d8.:32(-> \dr g16:64)(-> - d4) - | - \triplet { d8 d g } - \flam d8. \fr g16 -> - \triplet { d16\< g d g d8 } - g16\! d8. - | - d8.[:32(\< \dr g16]:32)(-> \> - d8.[:32)( g16]:32)(-> \< - d8.[:32)( g16]:32)(-> - d8.) \! \fr -} -snareBA = \drummode{ - g16 | - \triplet {d8 g \flam d } - \triplet {g d \flam g } - \triplet {d8 g \flam d \dr } - \flam g8. g16 - | - \flam d16. d32 \flam g8 \fr - d8.:32( g16:32)(-> - d16.) g32 d8 - \flam d8. g16 \dr - | - \flam d8. \fr g16 - d4:32( - \triplet { d16) g d g d8} - g8. g16 - | - d8.[:32(\< \dr g16]:32)(-> \> - d8.[:32)( g16]:32)(-> \< - d8.[:32)( g16]:32)(-> - d8.) \! \fr -} -snareBB = \drummode{ - g16 | - \triplet {d8 g \flam d} - \triplet {g d \flam g} - \triplet {d8 g \flam d} - \flam g8. g16 - | - \flam d16. d32 \flam g8 - d8.:32( g16:32)(-> - d16.) g32 d8 - \flam d8. g16 - | - \drag d16 d8 g16 - d8.:32( g16) - \flamd \triplet { d8 \< g16 g d8 } - \flam g4-> \! - | - d8.[:32( g16]:32)(-> - d8.:32)( g16]:32)(-> - d8.[:32)( g16]:32)(-> - d8.) -} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily deleted file mode 100755 index 6e93fb8..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily +++ /dev/null @@ -1,56 +0,0 @@ -% 4/4 Lady MacKenzie of Fairburn -% Tenor -\version "2.18.2" -composerTenor = "E.T. de Boone, v0.8, 2015" -tenorA = \drummode { - d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> - | - \flourish { d4 g4 d4 g4 } - | - d4 r16 g d-> r r8. g16 d4 - | - d4 g4 d4 r4 - | -} -tenorBA = \drummode { - \triplet { d8 \< g d } - \triplet { g8 d g } - \triplet { d8 g d } - g8. \! g16 - | - d8. g16-> - r8. g16 - d8. g16-> - r4 - | - d8. g16 - d4 - g8. d16 - g4 - | - d8 \flourish g8 - r8 \flourish d8 - r8 g8 - d4 -} -tenorBB = \drummode { - \triplet { d8 \< g d } - \triplet { g8 d g } - \triplet { d8 g d } - g8. \! g16 - | - d8.^"begin scoop" \dr g16-> - r8. g16 - d8.^"end scoop" \fr g16-> - r4 - | - d16 g8. - \flourish d4 - g8. d16 - \flourish g4 - | - \triplet { d8 g d } - g4 - d8. g16 - d4 -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly deleted file mode 100755 index 711e24c..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.pipes.ily" - -\score { - \new Staff { - \global - \bagpipeKey - << - {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} - {\pipesA s16 \pipesBA \pipesBB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly deleted file mode 100755 index e82ac70..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \line } \break \part \line \bar "||" \break \line \bar "|."} - {\snareA s16 \snareBA \snareBB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly deleted file mode 100755 index 896c011..0000000 --- a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \line } \break \line \break \line \bar "|."} - {\tenorA \tenorBA \tenorBB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly deleted file mode 100755 index 5377e71..0000000 --- a/strathspeys/molly_connell/bass.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.bass.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - \repeat volta 2 { \line \break \line \break } - {\bassAA \bassAB} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentBass - composer = \composerBass - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily deleted file mode 100755 index 7c7ab19..0000000 --- a/strathspeys/molly_connell/config.ily +++ /dev/null @@ -1,13 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - \tempo 4 = 120 - } -%% Format -part = { \partial 8 s8 } -line = { \repeat unfold 4 { s1 } } - -%% Headers -title = "Molly Connell" -meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly deleted file mode 100755 index c46ce33..0000000 --- a/strathspeys/molly_connell/drums.ly +++ /dev/null @@ -1,78 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.v1.1.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - \global - << - { - \line \break - \line \break - \bar "|." - - \part \line \break - \part \line \break - \bar "|." - }%End of Format - { - \set Score.proportionalNotationDuration = #(ly:make-moment 1/8) - \snareA - s8 - \snareA - s8 - - \snareBA - \snareBB - } - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - \bassAA - \bassAB - - s8 - \bassAA - s8 - \bassAB - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - \tenorA - \tenorA - - s8 - \tenorBA - s8 - \tenorBB - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily deleted file mode 100755 index a1af8bb..0000000 --- a/strathspeys/molly_connell/notes.bass.ily +++ /dev/null @@ -1,16 +0,0 @@ -% 4/4 Molly Connell -% Bass -\version "2.18.2" -composerBass = "W.H. de Boone / E.T. de Boone, 2014" -bassAA = \drummode { - d4-> g4-> d4 g4 | - d4 g4 d4 g4 | - d4-> g4 d4 g4 | - d4-> g4 d8.-> g16 d4 | - } -bassAB = \drummode { - d4-> g4-> d4 g4 | - r8 d8 r8 g8 r8 d8 r8 g8 | - d4-> g4 d4 g4 | - d4-> g4 r8. g16 d4 | -} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily deleted file mode 100755 index 8a5ac64..0000000 --- a/strathspeys/molly_connell/notes.side.ily +++ /dev/null @@ -1,28 +0,0 @@ -% 4/4 Molly Connell -% Side -\version "2.18.2" -composerSide = "v1.0, 21-2-2014" -snareA = \drummode { - \flam d4 \flam g8.[ d16:64(] d8.[) \drag d16] d8.[ g16] | - d8.:64[( g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] | - - d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 -} - -snareBA = \drummode { - \partial 8 g8 | - d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | - - \flamd \triplet { d8[ g16 g16 d8] } g8.[ g16] \triplet { d8[ g16 g16 d8] } g8.[ g16] | - \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| -} -snareBB = \drummode { - \partial 8 g8 | - d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | - - \flam d4 \flam g8.[ d16:64]( d8.[) \drag g16] d8.[ g16] | - \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| -} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.v1.1.ily b/strathspeys/molly_connell/notes.side.v1.1.ily deleted file mode 100755 index ff78686..0000000 --- a/strathspeys/molly_connell/notes.side.v1.1.ily +++ /dev/null @@ -1,28 +0,0 @@ -% 4/4 Molly Connell -% Side -\version "2.18.2" -composerSide = "v1.1, 2015" -snareA = \drummode { - \flamddr d4 \flam g8.[\fr d16:64(] d8.[) \dragddr d16] d8.[ \fr g16] | - d8.:64[(-> g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flamddr g8] } \flam d8.[ \fr g16] | - - d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \flamddr \triplet { d8 \fr g d } \flamddr g8.[ \flam g16] \triplet { d16 g d g d8 } g8 \fr -} - -snareBA = \drummode { - \partial 8 g8 \dr | - d4:32( d8.[) \drag d16] \fr \triplet { d16[ g d g d8] } g8.[ g16] \dr | - \drag d16[ d8.] \flam d8.[ \flam g16] \fr \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | - - \flamddr \triplet { d8[ \fr g16 g16 d8] } g8.[ g16] \flamddr \triplet { d8[\fr g16 g16 d8] } g8.[ g16] | - \flamddr \triplet { d8[ \fr g d] } \flamddr g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 \fr | -} -snareBB = \drummode { - \partial 8 g8 | - d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | - \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[\> d g]\! } | - - \flam d4 \flam g8.[ d16:64]( d8.[) \drag d16] d8.[ g16] | - \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 | -} diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily deleted file mode 100755 index 49ada61..0000000 --- a/strathspeys/molly_connell/notes.tenor.ily +++ /dev/null @@ -1,22 +0,0 @@ -% 4/4 Molly Connell -% Tenor -\version "2.18.2" -composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, 2014" -tenorA = \drummode { - d4 g4 d8. g16 d4 - d4 g4 r8. g16 d4 | - \flourish { d4 d4 g4 g4 } | - \flourish d4 \flourish g4 d4^\up g4^\up | -} -tenorBA = \drummode { - d4^\up g4^\up \flourish { d4 g4 } | - d4 \parenthesize d8. g16 r8. g16 d4 | - \flourish { d4 d4 g4 g4 } | - \flourish d4 \flourish g4 d4^\up g4^\up | -} -tenorBB = \drummode { - d4^\up g4^\up \flourish { d4 g4 } | - d4 \parenthesize d8. g16 r8. g16 d4 | - d4 g4 d8. g16 d4 | - \flourish d4 \flourish g4 d4^\up g4^\up | -} \ No newline at end of file diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly deleted file mode 100755 index a1888ef..0000000 --- a/strathspeys/molly_connell/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.v1.1.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." } - {\snareA s8 \snareBA \snareBB } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly deleted file mode 100755 index 7fc6955..0000000 --- a/strathspeys/molly_connell/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {\repeat volta 2 {\line} \break \line \bar "||" \break \line \bar "|." } - {\tenorA \tenorBA \tenorBB } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file diff --git a/template/config.ily b/template/config.ily deleted file mode 100755 index 61c2dff..0000000 --- a/template/config.ily +++ /dev/null @@ -1,14 +0,0 @@ -\version "2.19.0" -%% Globals -global = { - \time 4/4 - } - -%% Format -part = { \partial 8 s8 } -halfline = { \repeat unfold 4 { s1 | } } -line = { \repeat unfold 2 { \halfline } } - -%% Headers -title = "Title" -meter = "Meter" \ No newline at end of file diff --git a/template/drums.ly b/template/drums.ly deleted file mode 100755 index 846ee3f..0000000 --- a/template/drums.ly +++ /dev/null @@ -1,47 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" - -\score { - \new StaffGroup << - \new PipeBandDrumStaff = "side" { - \global - \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - << - { }%Format - { }%Music - >> - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - } - >> - \header { - title = \title - meter = \meter - composer = \markup { - \column \right-align { - $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/template/full.ly b/template/full.ly deleted file mode 100755 index bbecdd8..0000000 --- a/template/full.ly +++ /dev/null @@ -1,55 +0,0 @@ -\version "2.19.0" - -\include "config.ily" -\include "notes.bass.ily" -\include "notes.tenor.ily" -\include "notes.side.ily" -\include "notes.pipes.ily" - -\score { - \new StaffGroup << - \new Staff { - \global - \bagpipeKey - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } - << - {}%Format - {}%Pipes - >> - } - \new PipeBandDrumStaff = "side" { - \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} - \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} - - } - \new PipeBandDrumStaff = "bass" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} - - } - \new PipeBandDrumStaff = "tenor" { - \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } - \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } - - } - >> - \header { - title = \title - meter = \meter - composer = \markup \large { - \column \right-align { - $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) - $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) - $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) - $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) - $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) - } - } - } -} \ No newline at end of file diff --git a/template/notes.bass.ily b/template/notes.bass.ily deleted file mode 100755 index 4f6752c..0000000 --- a/template/notes.bass.ily +++ /dev/null @@ -1,6 +0,0 @@ -% <<TimeSig>> <<Title>> -% Bass -\version "2.18.2" -composerBass = "" -bassA = \drummode { -} \ No newline at end of file diff --git a/template/notes.pipes.ily b/template/notes.pipes.ily deleted file mode 100755 index db072ff..0000000 --- a/template/notes.pipes.ily +++ /dev/null @@ -1,6 +0,0 @@ -% <<TimeSig>> <<Title>> -% Pipes -\version "2.18.2" -composerPipes = "" -pipesA = { -} \ No newline at end of file diff --git a/template/notes.side.ily b/template/notes.side.ily deleted file mode 100755 index dbaf43f..0000000 --- a/template/notes.side.ily +++ /dev/null @@ -1,6 +0,0 @@ -% <<TimeSig>> <<Title>> -% Side -\version "2.18.2" -composerSide = "" -\snareA = \drummode { -} \ No newline at end of file diff --git a/template/notes.tenor.ily b/template/notes.tenor.ily deleted file mode 100755 index f572169..0000000 --- a/template/notes.tenor.ily +++ /dev/null @@ -1,6 +0,0 @@ -% <<TimeSig>> <<Title>> -% Tenor -\version "2.18.2" -composerTenor = "" -tenorA = \drummode { -} \ No newline at end of file diff --git a/template/pipes.ly b/template/pipes.ly deleted file mode 100755 index facb3fb..0000000 --- a/template/pipes.ly +++ /dev/null @@ -1,21 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.pipes.ily" - -\score { - \new Staff { - \global - \bagpipeKey - << - { } - { } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentPipes - composer = \composerPipes - } -} \ No newline at end of file diff --git a/template/side.ly b/template/side.ly deleted file mode 100755 index ee8dae0..0000000 --- a/template/side.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.side.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - { } - { } - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentSide - composer = \composerSide - } -} \ No newline at end of file diff --git a/template/tenor.ly b/template/tenor.ly deleted file mode 100755 index a96bc97..0000000 --- a/template/tenor.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "2.18.2" - -\include "config.ily" -\include "notes.tenor.ily" - -\score { - \new PipeBandDrumStaff { - \global - << - {} - {} - >> - } - \header { - title = \title - meter = \meter - instrument = \instrumentTenor - composer = \composerTenor - } -} \ No newline at end of file From c601ae3601b43ce2758fbdf5044673217cce988b Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Fri, 18 Dec 2015 14:10:39 +0100 Subject: [PATCH 32/33] Revert "Decided to put all the music files in a separate git" This reverts commit c6a9c956321a175e33e1668cea8e8e3e19cb7a0e. --- .gitignore | 12 +- {lilydrum => .lilydrum}/embellishments.ily | 0 .../flourish_symbols/butterfly.eps | 0 .../flourish_symbols/st_andrews_crss.eps | 0 .../flourish_symbols/stop.eps | 0 {lilydrum => .lilydrum}/flourishing.ily | 0 {lilydrum => .lilydrum}/layout_tweaks.ily | 0 {lilydrum => .lilydrum}/musical_functions.ily | 0 {lilydrum => .lilydrum}/special_sticking.ily | 0 2-4_marches/black_bear/config.ily | 14 ++ 2-4_marches/black_bear/notes.side.ily | 31 +++ 2-4_marches/black_bear/notes.side.v1.2.ily | 33 ++++ 2-4_marches/black_bear/notes.side.v1.3.ily | 33 ++++ 2-4_marches/black_bear/side.ly | 27 +++ 2-4_marches/duncan_mcinness/config.ily | 15 ++ 2-4_marches/duncan_mcinness/notes.side.ily | 83 ++++++++ 2-4_marches/duncan_mcinness/side.ly | 32 ++++ 2-4_marches/mackenzie_highlanders/config.ily | 21 ++ .../mackenzie_highlanders/notes.side.alt.ily | 48 +++++ .../mackenzie_highlanders/notes.side.ily | 36 ++++ 2-4_marches/mackenzie_highlanders/side.alt.ly | 28 +++ 2-4_marches/mackenzie_highlanders/side.ly | 26 +++ 3-4_marches/castle_dangerous/config.ily | 20 ++ 3-4_marches/castle_dangerous/notes.tenor.ily | 24 +++ 3-4_marches/castle_dangerous/tenor.ly | 24 +++ .../on_the_road_to_passchendaele/config.ily | 20 ++ .../notes.side.ily | 35 ++++ .../on_the_road_to_passchendaele/side.ly | 33 ++++ 4-4_marches/51st_highland_division/config.ily | 19 ++ .../51st_highland_division/notes.side.ily | 29 +++ 4-4_marches/51st_highland_division/side.ly | 35 ++++ 4-4_marches/flett_from_flotta/config.ily | 21 ++ 4-4_marches/flett_from_flotta/notes.side.ily | 29 +++ 4-4_marches/flett_from_flotta/side.ly | 28 +++ 4-4_marches/minstrel_boy/config.ily | 20 ++ 4-4_marches/minstrel_boy/notes.side.ily | 33 ++++ 4-4_marches/minstrel_boy/side.ly | 33 ++++ 4-4_marches/rowan_tree/config.ily | 21 ++ 4-4_marches/rowan_tree/notes.side.ily | 23 +++ 4-4_marches/rowan_tree/side.ly | 27 +++ 4-4_marches/scotland_the_brave/config.ily | 21 ++ 4-4_marches/scotland_the_brave/notes.side.ily | 21 ++ 4-4_marches/scotland_the_brave/side.ly | 27 +++ .../the_leaving_of_liverpool/config.ily | 15 ++ 4-4_marches/the_leaving_of_liverpool/drums.ly | 63 ++++++ .../the_leaving_of_liverpool/notes.side.ily | 33 ++++ .../the_leaving_of_liverpool/notes.tenor.ily | 27 +++ 4-4_marches/the_leaving_of_liverpool/side.ly | 30 +++ 4-4_marches/the_leaving_of_liverpool/tenor.ly | 20 ++ 4-4_marches/the_old_rustic_bridge/config.ily | 21 ++ .../the_old_rustic_bridge/notes.tenor.ily | 13 ++ 4-4_marches/the_old_rustic_bridge/tenor.ly | 20 ++ 4-4_marches/the_pikemans_march/config.ily | 19 ++ 4-4_marches/the_pikemans_march/drums.ly | 68 +++++++ 4-4_marches/the_pikemans_march/notes.side.ily | 39 ++++ .../the_pikemans_march/notes.side.v1.5.ily | 39 ++++ .../the_pikemans_march/notes.side.v1.6.ily | 39 ++++ .../the_pikemans_march/notes.tenor.ily | 41 ++++ 4-4_marches/the_pikemans_march/side.ly | 32 ++++ 4-4_marches/the_pikemans_march/tenor.ly | 32 ++++ .../were_no_awa_tae_bide_awa/config.ily | 15 ++ .../were_no_awa_tae_bide_awa/notes.side.ily | 19 ++ 4-4_marches/were_no_awa_tae_bide_awa/side.ly | 26 +++ 4-4_marches/wings/config.ily | 14 ++ 4-4_marches/wings/notes.side.ily | 28 +++ 4-4_marches/wings/side.ly | 39 ++++ 5-4_marches/cullen_bay/bass.ly | 20 ++ 5-4_marches/cullen_bay/config.ily | 13 ++ 5-4_marches/cullen_bay/drums.ly | 65 +++++++ 5-4_marches/cullen_bay/notes.bass.ily | 7 + 5-4_marches/cullen_bay/notes.side.ily | 62 ++++++ 5-4_marches/cullen_bay/notes.tenor.ily | 16 ++ 5-4_marches/cullen_bay/side.ly | 30 +++ 5-4_marches/cullen_bay/tenor.ly | 20 ++ 6-8_marches/hills_of_glenorchy/config.ily | 14 ++ 6-8_marches/hills_of_glenorchy/notes.side.ily | 33 ++++ 6-8_marches/hills_of_glenorchy/side.ly | 26 +++ airs/abide_with_me/config.ily | 14 ++ airs/abide_with_me/notes.side.ily | 16 ++ airs/abide_with_me/side.ly | 31 +++ airs/alexander_mackenzie/config.ily | 14 ++ airs/alexander_mackenzie/notes.side.ily | 36 ++++ airs/alexander_mackenzie/side.ly | 31 +++ airs/amazing_grace/config.ily | 14 ++ airs/amazing_grace/notes.side.ily | 31 +++ airs/amazing_grace/side.ly | 34 ++++ airs/farewell_to_camraw/config.ily | 13 ++ airs/farewell_to_camraw/drums.ly | 50 +++++ airs/farewell_to_camraw/notes.side.ily | 14 ++ airs/farewell_to_camraw/notes.tenor.ily | 15 ++ airs/farewell_to_camraw/side.ly | 20 ++ airs/farewell_to_camraw/tenor.ly | 20 ++ airs/flower_of_scotland/config.ily | 14 ++ airs/flower_of_scotland/notes.side.ily | 26 +++ airs/flower_of_scotland/side.ly | 24 +++ airs/loch_duich/config.ily | 14 ++ airs/loch_duich/notes.side.ily | 46 +++++ airs/loch_duich/side.ly | 33 ++++ airs/miss_kirkwood/config.ily | 14 ++ airs/miss_kirkwood/notes.side.ily | 25 +++ airs/miss_kirkwood/side.ly | 26 +++ airs/morag_of_dunvegan/bass.ly | 20 ++ airs/morag_of_dunvegan/config.ily | 18 ++ airs/morag_of_dunvegan/drums.ly | 51 +++++ airs/morag_of_dunvegan/notes.bass.ily | 23 +++ airs/morag_of_dunvegan/notes.side.ily | 30 +++ airs/morag_of_dunvegan/notes.tenor.ily | 29 +++ airs/morag_of_dunvegan/side.ly | 20 ++ airs/morag_of_dunvegan/tenor.ly | 20 ++ airs/my_home/config.ily | 14 ++ airs/my_home/drums.ly | 54 ++++++ airs/my_home/notes.bass.ily | 6 + airs/my_home/notes.side.ily | 26 +++ airs/my_home/notes.tenor.ily | 15 ++ airs/my_home/side.ly | 26 +++ airs/my_home/tenor.ly | 26 +++ airs/the_mist_covered_mountains/config.ily | 19 ++ airs/the_mist_covered_mountains/drums.ly | 51 +++++ .../the_mist_covered_mountains/notes.side.ily | 23 +++ .../notes.tenor.ily | 25 +++ airs/the_mist_covered_mountains/side.ly | 20 ++ airs/the_mist_covered_mountains/tenor.ly | 20 ++ book/.gitignore | 7 + book/bass_book.tex | 22 +++ book/clean | 2 + book/drums_book.tex | 22 +++ book/full_book.tex | 22 +++ book/init | 50 +++++ book/load_scores | 34 ++++ book/makebook | 180 ++++++++++++++++++ book/pipes_book.tex | 22 +++ book/side_book.tex | 22 +++ book/tenor_book.tex | 22 +++ book/tex/main_bass.tex | 17 ++ book/tex/main_drums.tex | 20 ++ book/tex/main_full.tex | 13 ++ book/tex/main_pipes.tex | 14 ++ book/tex/main_side.tex | 58 ++++++ book/tex/main_tenor.tex | 24 +++ book/tex/score_book.cls | 36 ++++ book/tex/titlepage.tex | 6 + build_all | 14 ++ cheatsheet.ly | 23 +-- example.ly | 24 +++ header_book.ily | 42 ++++ header_default.ily | 39 ++++ hornpipes/itchy_fingers/config.ily | 15 ++ hornpipes/itchy_fingers/notes.side.ily | 35 ++++ hornpipes/itchy_fingers/side.ly | 27 +++ jigs/seaforth_sticks/config.ily | 14 ++ jigs/seaforth_sticks/drums.ly | 65 +++++++ jigs/seaforth_sticks/notes.bass.ily | 6 + jigs/seaforth_sticks/notes.side.ily | 123 ++++++++++++ jigs/seaforth_sticks/notes.tenor.ily | 6 + jigs/seaforth_sticks/side.ly | 38 ++++ jigs/seaforth_sticks/tenor.ly | 29 +++ lilydrum.ly | 10 +- makedrum | 45 ++--- other/band_of_brothers.snare.ly | 128 +++++++++++++ standards/24_standards.side.ly | 73 +++++++ standards/34_standards1.side.ly | 64 +++++++ standards/34_standards2.side.ly | 61 ++++++ standards/34_standards3.side.ly | 65 +++++++ standards/44_standards.side.ly | 93 +++++++++ standards/68_standards.side.ly | 90 +++++++++ standards/standards.bass.ly | 64 +++++++ standards/standards.tenor.ly | 132 +++++++++++++ strathspeys/aa_camerons/config.ily | 14 ++ strathspeys/aa_camerons/notes.side.ily | 30 +++ strathspeys/aa_camerons/side.ly | 39 ++++ .../lady_mackenzie_of_fairburn/bass.ly | 20 ++ .../lady_mackenzie_of_fairburn/config.ily | 13 ++ .../lady_mackenzie_of_fairburn/drums.ly | 51 +++++ .../lady_mackenzie_of_fairburn/full.ly | 64 +++++++ .../lady_mackenzie_of_fairburn/notes.bass.ily | 25 +++ .../notes.pipes.ily | 70 +++++++ .../lady_mackenzie_of_fairburn/notes.side.ily | 69 +++++++ .../notes.tenor.ily | 56 ++++++ .../lady_mackenzie_of_fairburn/pipes.ly | 21 ++ .../lady_mackenzie_of_fairburn/side.ly | 20 ++ .../lady_mackenzie_of_fairburn/tenor.ly | 20 ++ strathspeys/molly_connell/bass.ly | 20 ++ strathspeys/molly_connell/config.ily | 13 ++ strathspeys/molly_connell/drums.ly | 78 ++++++++ strathspeys/molly_connell/notes.bass.ily | 16 ++ strathspeys/molly_connell/notes.side.ily | 28 +++ strathspeys/molly_connell/notes.side.v1.1.ily | 28 +++ strathspeys/molly_connell/notes.tenor.ily | 22 +++ strathspeys/molly_connell/side.ly | 20 ++ strathspeys/molly_connell/tenor.ly | 20 ++ template/config.ily | 14 ++ template/drums.ly | 47 +++++ template/full.ly | 55 ++++++ template/notes.bass.ily | 6 + template/notes.pipes.ily | 6 + template/notes.side.ily | 6 + template/notes.tenor.ily | 6 + template/pipes.ly | 21 ++ template/side.ly | 20 ++ template/tenor.ly | 20 ++ 200 files changed, 5913 insertions(+), 54 deletions(-) rename {lilydrum => .lilydrum}/embellishments.ily (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/flourish_symbols/butterfly.eps (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/flourish_symbols/st_andrews_crss.eps (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/flourish_symbols/stop.eps (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/flourishing.ily (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/layout_tweaks.ily (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/musical_functions.ily (100%) mode change 100644 => 100755 rename {lilydrum => .lilydrum}/special_sticking.ily (100%) mode change 100644 => 100755 create mode 100755 2-4_marches/black_bear/config.ily create mode 100755 2-4_marches/black_bear/notes.side.ily create mode 100755 2-4_marches/black_bear/notes.side.v1.2.ily create mode 100755 2-4_marches/black_bear/notes.side.v1.3.ily create mode 100755 2-4_marches/black_bear/side.ly create mode 100755 2-4_marches/duncan_mcinness/config.ily create mode 100755 2-4_marches/duncan_mcinness/notes.side.ily create mode 100755 2-4_marches/duncan_mcinness/side.ly create mode 100755 2-4_marches/mackenzie_highlanders/config.ily create mode 100755 2-4_marches/mackenzie_highlanders/notes.side.alt.ily create mode 100755 2-4_marches/mackenzie_highlanders/notes.side.ily create mode 100755 2-4_marches/mackenzie_highlanders/side.alt.ly create mode 100755 2-4_marches/mackenzie_highlanders/side.ly create mode 100755 3-4_marches/castle_dangerous/config.ily create mode 100755 3-4_marches/castle_dangerous/notes.tenor.ily create mode 100755 3-4_marches/castle_dangerous/tenor.ly create mode 100755 3-4_marches/on_the_road_to_passchendaele/config.ily create mode 100755 3-4_marches/on_the_road_to_passchendaele/notes.side.ily create mode 100755 3-4_marches/on_the_road_to_passchendaele/side.ly create mode 100755 4-4_marches/51st_highland_division/config.ily create mode 100755 4-4_marches/51st_highland_division/notes.side.ily create mode 100755 4-4_marches/51st_highland_division/side.ly create mode 100755 4-4_marches/flett_from_flotta/config.ily create mode 100755 4-4_marches/flett_from_flotta/notes.side.ily create mode 100755 4-4_marches/flett_from_flotta/side.ly create mode 100755 4-4_marches/minstrel_boy/config.ily create mode 100755 4-4_marches/minstrel_boy/notes.side.ily create mode 100755 4-4_marches/minstrel_boy/side.ly create mode 100755 4-4_marches/rowan_tree/config.ily create mode 100755 4-4_marches/rowan_tree/notes.side.ily create mode 100755 4-4_marches/rowan_tree/side.ly create mode 100755 4-4_marches/scotland_the_brave/config.ily create mode 100755 4-4_marches/scotland_the_brave/notes.side.ily create mode 100755 4-4_marches/scotland_the_brave/side.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/config.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/drums.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/notes.side.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/notes.tenor.ily create mode 100755 4-4_marches/the_leaving_of_liverpool/side.ly create mode 100755 4-4_marches/the_leaving_of_liverpool/tenor.ly create mode 100755 4-4_marches/the_old_rustic_bridge/config.ily create mode 100755 4-4_marches/the_old_rustic_bridge/notes.tenor.ily create mode 100755 4-4_marches/the_old_rustic_bridge/tenor.ly create mode 100755 4-4_marches/the_pikemans_march/config.ily create mode 100755 4-4_marches/the_pikemans_march/drums.ly create mode 100755 4-4_marches/the_pikemans_march/notes.side.ily create mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.5.ily create mode 100755 4-4_marches/the_pikemans_march/notes.side.v1.6.ily create mode 100755 4-4_marches/the_pikemans_march/notes.tenor.ily create mode 100755 4-4_marches/the_pikemans_march/side.ly create mode 100755 4-4_marches/the_pikemans_march/tenor.ly create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/config.ily create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily create mode 100755 4-4_marches/were_no_awa_tae_bide_awa/side.ly create mode 100755 4-4_marches/wings/config.ily create mode 100755 4-4_marches/wings/notes.side.ily create mode 100755 4-4_marches/wings/side.ly create mode 100755 5-4_marches/cullen_bay/bass.ly create mode 100755 5-4_marches/cullen_bay/config.ily create mode 100755 5-4_marches/cullen_bay/drums.ly create mode 100755 5-4_marches/cullen_bay/notes.bass.ily create mode 100755 5-4_marches/cullen_bay/notes.side.ily create mode 100755 5-4_marches/cullen_bay/notes.tenor.ily create mode 100755 5-4_marches/cullen_bay/side.ly create mode 100755 5-4_marches/cullen_bay/tenor.ly create mode 100755 6-8_marches/hills_of_glenorchy/config.ily create mode 100755 6-8_marches/hills_of_glenorchy/notes.side.ily create mode 100755 6-8_marches/hills_of_glenorchy/side.ly create mode 100755 airs/abide_with_me/config.ily create mode 100755 airs/abide_with_me/notes.side.ily create mode 100755 airs/abide_with_me/side.ly create mode 100755 airs/alexander_mackenzie/config.ily create mode 100755 airs/alexander_mackenzie/notes.side.ily create mode 100755 airs/alexander_mackenzie/side.ly create mode 100755 airs/amazing_grace/config.ily create mode 100755 airs/amazing_grace/notes.side.ily create mode 100755 airs/amazing_grace/side.ly create mode 100755 airs/farewell_to_camraw/config.ily create mode 100755 airs/farewell_to_camraw/drums.ly create mode 100755 airs/farewell_to_camraw/notes.side.ily create mode 100755 airs/farewell_to_camraw/notes.tenor.ily create mode 100755 airs/farewell_to_camraw/side.ly create mode 100755 airs/farewell_to_camraw/tenor.ly create mode 100755 airs/flower_of_scotland/config.ily create mode 100755 airs/flower_of_scotland/notes.side.ily create mode 100755 airs/flower_of_scotland/side.ly create mode 100755 airs/loch_duich/config.ily create mode 100755 airs/loch_duich/notes.side.ily create mode 100755 airs/loch_duich/side.ly create mode 100755 airs/miss_kirkwood/config.ily create mode 100755 airs/miss_kirkwood/notes.side.ily create mode 100755 airs/miss_kirkwood/side.ly create mode 100755 airs/morag_of_dunvegan/bass.ly create mode 100755 airs/morag_of_dunvegan/config.ily create mode 100755 airs/morag_of_dunvegan/drums.ly create mode 100755 airs/morag_of_dunvegan/notes.bass.ily create mode 100755 airs/morag_of_dunvegan/notes.side.ily create mode 100755 airs/morag_of_dunvegan/notes.tenor.ily create mode 100755 airs/morag_of_dunvegan/side.ly create mode 100755 airs/morag_of_dunvegan/tenor.ly create mode 100755 airs/my_home/config.ily create mode 100755 airs/my_home/drums.ly create mode 100755 airs/my_home/notes.bass.ily create mode 100755 airs/my_home/notes.side.ily create mode 100755 airs/my_home/notes.tenor.ily create mode 100755 airs/my_home/side.ly create mode 100755 airs/my_home/tenor.ly create mode 100755 airs/the_mist_covered_mountains/config.ily create mode 100755 airs/the_mist_covered_mountains/drums.ly create mode 100755 airs/the_mist_covered_mountains/notes.side.ily create mode 100755 airs/the_mist_covered_mountains/notes.tenor.ily create mode 100755 airs/the_mist_covered_mountains/side.ly create mode 100755 airs/the_mist_covered_mountains/tenor.ly create mode 100644 book/.gitignore create mode 100644 book/bass_book.tex create mode 100644 book/clean create mode 100644 book/drums_book.tex create mode 100644 book/full_book.tex create mode 100644 book/init create mode 100644 book/load_scores create mode 100644 book/makebook create mode 100644 book/pipes_book.tex create mode 100644 book/side_book.tex create mode 100644 book/tenor_book.tex create mode 100644 book/tex/main_bass.tex create mode 100644 book/tex/main_drums.tex create mode 100644 book/tex/main_full.tex create mode 100644 book/tex/main_pipes.tex create mode 100644 book/tex/main_side.tex create mode 100644 book/tex/main_tenor.tex create mode 100644 book/tex/score_book.cls create mode 100644 book/tex/titlepage.tex create mode 100755 build_all create mode 100755 example.ly create mode 100755 header_book.ily create mode 100755 header_default.ily create mode 100755 hornpipes/itchy_fingers/config.ily create mode 100755 hornpipes/itchy_fingers/notes.side.ily create mode 100755 hornpipes/itchy_fingers/side.ly create mode 100755 jigs/seaforth_sticks/config.ily create mode 100755 jigs/seaforth_sticks/drums.ly create mode 100755 jigs/seaforth_sticks/notes.bass.ily create mode 100755 jigs/seaforth_sticks/notes.side.ily create mode 100755 jigs/seaforth_sticks/notes.tenor.ily create mode 100755 jigs/seaforth_sticks/side.ly create mode 100755 jigs/seaforth_sticks/tenor.ly create mode 100755 other/band_of_brothers.snare.ly create mode 100755 standards/24_standards.side.ly create mode 100755 standards/34_standards1.side.ly create mode 100755 standards/34_standards2.side.ly create mode 100755 standards/34_standards3.side.ly create mode 100755 standards/44_standards.side.ly create mode 100755 standards/68_standards.side.ly create mode 100755 standards/standards.bass.ly create mode 100755 standards/standards.tenor.ly create mode 100755 strathspeys/aa_camerons/config.ily create mode 100755 strathspeys/aa_camerons/notes.side.ily create mode 100755 strathspeys/aa_camerons/side.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/bass.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/config.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/drums.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/full.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.side.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily create mode 100755 strathspeys/lady_mackenzie_of_fairburn/pipes.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/side.ly create mode 100755 strathspeys/lady_mackenzie_of_fairburn/tenor.ly create mode 100755 strathspeys/molly_connell/bass.ly create mode 100755 strathspeys/molly_connell/config.ily create mode 100755 strathspeys/molly_connell/drums.ly create mode 100755 strathspeys/molly_connell/notes.bass.ily create mode 100755 strathspeys/molly_connell/notes.side.ily create mode 100755 strathspeys/molly_connell/notes.side.v1.1.ily create mode 100755 strathspeys/molly_connell/notes.tenor.ily create mode 100755 strathspeys/molly_connell/side.ly create mode 100755 strathspeys/molly_connell/tenor.ly create mode 100755 template/config.ily create mode 100755 template/drums.ly create mode 100755 template/full.ly create mode 100755 template/notes.bass.ily create mode 100755 template/notes.pipes.ily create mode 100755 template/notes.side.ily create mode 100755 template/notes.tenor.ily create mode 100755 template/pipes.ly create mode 100755 template/side.ly create mode 100755 template/tenor.ly diff --git a/.gitignore b/.gitignore index 128ea98..9c0039b 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +*.ps *.pdf -/pdf -/tmp +*.png +*.log +*tmp* +*.py +*.toc +*.aux +_output/ +pdf/ +fullscores/* diff --git a/lilydrum/embellishments.ily b/.lilydrum/embellishments.ily old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/embellishments.ily rename to .lilydrum/embellishments.ily diff --git a/lilydrum/flourish_symbols/butterfly.eps b/.lilydrum/flourish_symbols/butterfly.eps old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/flourish_symbols/butterfly.eps rename to .lilydrum/flourish_symbols/butterfly.eps diff --git a/lilydrum/flourish_symbols/st_andrews_crss.eps b/.lilydrum/flourish_symbols/st_andrews_crss.eps old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/flourish_symbols/st_andrews_crss.eps rename to .lilydrum/flourish_symbols/st_andrews_crss.eps diff --git a/lilydrum/flourish_symbols/stop.eps b/.lilydrum/flourish_symbols/stop.eps old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/flourish_symbols/stop.eps rename to .lilydrum/flourish_symbols/stop.eps diff --git a/lilydrum/flourishing.ily b/.lilydrum/flourishing.ily old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/flourishing.ily rename to .lilydrum/flourishing.ily diff --git a/lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/layout_tweaks.ily rename to .lilydrum/layout_tweaks.ily diff --git a/lilydrum/musical_functions.ily b/.lilydrum/musical_functions.ily old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/musical_functions.ily rename to .lilydrum/musical_functions.ily diff --git a/lilydrum/special_sticking.ily b/.lilydrum/special_sticking.ily old mode 100644 new mode 100755 similarity index 100% rename from lilydrum/special_sticking.ily rename to .lilydrum/special_sticking.ily diff --git a/2-4_marches/black_bear/config.ily b/2-4_marches/black_bear/config.ily new file mode 100755 index 0000000..514c3ac --- /dev/null +++ b/2-4_marches/black_bear/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Black Bear" +meter = "March" \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily new file mode 100755 index 0000000..2a4e129 --- /dev/null +++ b/2-4_marches/black_bear/notes.side.ily @@ -0,0 +1,31 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + d8:32( | + g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d32 g32 d32 g32 d4 | + r4^\markup {\bold HOI} d8:32( g8:32)(-> | + + d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d4 d4:32( | + d8) \flamg g8 \flamd d8 +} +% Part 2 +snareBA = \drummode { + g8 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + d4:32( d4:32)( | + d8) g16. d32-> g16. g32 \flamd d16. g32 | + + d4:32( d8.:32)( g16:32)( | + d8:32)( g8:32)( d4)( | + g8:32)( d8:32)( g16.) d32-> g16. g32 | + \flamd d8 d8:32( g8) +} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.2.ily b/2-4_marches/black_bear/notes.side.v1.2.ily new file mode 100755 index 0000000..ff4ce2e --- /dev/null +++ b/2-4_marches/black_bear/notes.side.v1.2.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, v1.2, 2015" + +%%music +yell = \markup { \bold HOI} + +snareA = \drummode { + d8:32( | + g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( g8:32)(-> | + + d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 +} +% Part 2 +snareBA = \drummode { + g8 | + \tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } | + \flam d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | +} \ No newline at end of file diff --git a/2-4_marches/black_bear/notes.side.v1.3.ily b/2-4_marches/black_bear/notes.side.v1.3.ily new file mode 100755 index 0000000..8386890 --- /dev/null +++ b/2-4_marches/black_bear/notes.side.v1.3.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSide = "E.T. de Boone, v1.3, 2015" + +%%music +yell = \markup { \bold HOI} + +snareA = \drummode { + d8:32( | + g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16.-> \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 | + \flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 | + r4^\yell d8:32( \< g8:32)(-> | + + d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 | + \flam d4 d4:32( | + d8) \flam g8 \flam d8 +} +% Part 2 +snareBA = \drummode { + g8 + \flamd \tuplet 3/2 { d16 g16 d16->} g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( | + \tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } | + d8:32( g16.)(-> g32) d32 g16. d16. g32 | + + \flamd \tuplet 3/2 { d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | + \tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \flamd \tuplet 3/2 { d32 d32 g16 d16 } \flamg \tuplet 3/2 { g32 g32 d16 g16 } | + \flam d16. g32-> d16. d32 \flamg \tuplet 3/2 { g16[ d16 g16-> } d16. \drag g32] | + g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 | +} \ No newline at end of file diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly new file mode 100755 index 0000000..63f7b68 --- /dev/null +++ b/2-4_marches/black_bear/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.v1.3.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \halfline \break \halfline } \break + \part \line \bar "|." + } + { + \snareA s8 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/config.ily b/2-4_marches/duncan_mcinness/config.ily new file mode 100755 index 0000000..d691081 --- /dev/null +++ b/2-4_marches/duncan_mcinness/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Duncan McInnes" +meter = "Drum Salute in Quick Time" \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/notes.side.ily b/2-4_marches/duncan_mcinness/notes.side.ily new file mode 100755 index 0000000..da43ca6 --- /dev/null +++ b/2-4_marches/duncan_mcinness/notes.side.ily @@ -0,0 +1,83 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + d8:32( | + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 2 +snareB = \drummode { + r16. g32 | + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8:32( g8) | + + \flamd d8. d16 \flamg g16 r16 g16 \flamd d16 | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8. g16 | + + \flamd d8 d16. g32-> d16. d32 \flamg g8 | + \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> } d8-> d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 3 +snareC = \drummode { + d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +% Part 4 +snareDA = \drummode { + d16. g32 | + d8:32( g8:32)(-> d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) d16. g32 d8:32( g8) | + \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | +} +snareDAB = \drummode { + d8:32( g8:32)(-> d8.) d16:64( | + d16.) g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + + g8) \flamd d8 d16 \flamg g8 g16 | + \flamd d8 d8:32( g8) +} +snareDAC = \drummode { + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 | + d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + << + { + g8) \flamd d8 d16 \flamg g8 g16 | + } + \new PipeBandDrumStaff{ + \eighthBeaming + \once \omit Staff.TimeSignature + g16. d32:128( d16.) g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | + } + >> + + \flamd d8 d8:32( g4) + \bar "|." +} \ No newline at end of file diff --git a/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly new file mode 100755 index 0000000..eb5a099 --- /dev/null +++ b/2-4_marches/duncan_mcinness/side.ly @@ -0,0 +1,32 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } \break + \part \halfline \halfline \bar "||" \break + \part \halfline \halfline \bar "|." + } + { + \snareA s8 + \snareB s8 + \snareC s8 + \snareDA \snareDAB s8 + \snareDA \snareDAC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily new file mode 100755 index 0000000..e06e3f9 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "MacKenzie Highlanders" +meter = "Trooping of the Colours" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily new file mode 100755 index 0000000..75ff26a --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily @@ -0,0 +1,48 @@ +% 2/4 MacKenzie Highlanders +% Snare +\version "2.18.2" +composerSide = "alternate version" + +%%music +snareA = \drummode { + d8:32( | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d8) +} +% Part 2 +snareBA = \drummode { + g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + d8:64(-> g32) d g d g8 g8-> | + + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> g8:32(-> d8:32)(-> \tuplet 3/2{ g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d8) g8 +} +snareBB = \drummode { + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( g16.) g32-> d32 g d g-> d16.-> g32 | + \flam d4 d8:32(-> \< g8:32)(-> | + + d8)-> \! \tuplet 3/2 { g16 d g-> } d8:32(-> \tuplet 3/2 { g16) d g-> } + d32 g d g-> d16.-> g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + d8[-> \drag d16 d32-> g] d[ g \drag d16 d16. g32] | + d4:32( d4) +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily new file mode 100755 index 0000000..e96556f --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/notes.side.ily @@ -0,0 +1,36 @@ +% 2/4 MacKenzie Highlanders +% Snare +\version "2.18.2" +composerSnare = "" + +%%music +snareA = \drummode { + d8:32( | + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + \flam g8[ \drag d16. d32]-> g16.[ \drag d32 d16. g32] | + d4:32( d8) d8:32( | + + g8) \tuplet 3/2 { d16 g d } \flam g16. d32-> g16. g32 | + \flam d8 d8:32( g8:32)(-> \tuplet 3/2 { d16) g d } | + + + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | + d4:32( d8) +} +% Part 2 +snareB = \drummode { + g8 | + d8:32( \tuplet 3/2 { g16) d g-> } d16.-> g32-> d32 g d g-> | + d8-> d8:32( g8) d16. g32 | + + d8:32( \tuplet 3/2 { g16) d g-> } d32 g d g-> d16.-> g32 | + d4:32( d8) g8 | + + d8:32( \tuplet 3/2 { g16) d g-> } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d->} g16. g32 d8:32(-> \tuplet 3/2 { g16) d g } | + + \flam g8-> \tuplet 3/2 { \flam d16 g d-> } g16. g32 \flam d8 | + d4:32( d8) +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly new file mode 100755 index 0000000..c1d5d78 --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/side.alt.ly @@ -0,0 +1,28 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.alt.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \part \line \bar "||" \break + \line \bar "|." + } + { + \snareA s8 + \snareBA + \snareBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly new file mode 100755 index 0000000..049f71b --- /dev/null +++ b/2-4_marches/mackenzie_highlanders/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \repeat volta 2 { \part \line } + } + { + \snareA s8 + \snareB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/config.ily b/3-4_marches/castle_dangerous/config.ily new file mode 100755 index 0000000..f62ad90 --- /dev/null +++ b/3-4_marches/castle_dangerous/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Castle Dangerous" +meter = "March" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/notes.tenor.ily b/3-4_marches/castle_dangerous/notes.tenor.ily new file mode 100755 index 0000000..2cb9a1e --- /dev/null +++ b/3-4_marches/castle_dangerous/notes.tenor.ily @@ -0,0 +1,24 @@ +% 3/4 Castle Dangerous +% Tenor +\version "2.18.2" +composerTenor = "" + +%%music +tenorA = \drummode { + r8. d16 + g4 + r8 d8 + | + r8 g8 + r8 d8 + r8 g8 + | + r8 d8 + r8 g8 + r8 d8 + | + r8 g8 + r8 d16 g + d16 g d g + | +} \ No newline at end of file diff --git a/3-4_marches/castle_dangerous/tenor.ly b/3-4_marches/castle_dangerous/tenor.ly new file mode 100755 index 0000000..87e0cd6 --- /dev/null +++ b/3-4_marches/castle_dangerous/tenor.ly @@ -0,0 +1,24 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line } + } + { + \tenorA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/config.ily b/3-4_marches/on_the_road_to_passchendaele/config.ily new file mode 100755 index 0000000..1eab0ad --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "On the Road to Passchendaele" +meter = "Retreat" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily new file mode 100755 index 0000000..2dc6ba8 --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily @@ -0,0 +1,35 @@ +% 3/4 On the Road to Passchendaele +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + \flamd d8. g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | +} +snareAB = \drummode { + \flamd d8. g16 d4:32( d8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + d16[ \dragg g8 g16] d8:32( g8) d4:32( | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d4 d4:32( | + + d8.) g16 d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> | + \tuplet 3/2 { d16) g d-> } g16. g32 \flamd d8 d8:32( g16.) d32-> g16. g32 | +} +snareBB = \drummode { + d8. g16 d8:32( g8) d4:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d4:32( d4) | + + \flamd d8. g16 d4:32( d8:32)(-> \tuplet 3/2 { g16) d g } | + d16. d32 \flamg g8 d4:32( d4) +} \ No newline at end of file diff --git a/3-4_marches/on_the_road_to_passchendaele/side.ly b/3-4_marches/on_the_road_to_passchendaele/side.ly new file mode 100755 index 0000000..6c6e7dc --- /dev/null +++ b/3-4_marches/on_the_road_to_passchendaele/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line } \break + \line \bar "||" \break + \line \bar "|." + } + { + \snareAA + \snareAB + + \snareBA + \snareBB + + \snareBA + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/config.ily b/4-4_marches/51st_highland_division/config.ily new file mode 100755 index 0000000..62bd8fc --- /dev/null +++ b/4-4_marches/51st_highland_division/config.ily @@ -0,0 +1,19 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "51st Highland Division" +meter = "March" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/notes.side.ily b/4-4_marches/51st_highland_division/notes.side.ily new file mode 100755 index 0000000..96649e7 --- /dev/null +++ b/4-4_marches/51st_highland_division/notes.side.ily @@ -0,0 +1,29 @@ +% 4/4 51st Highland Division +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g8.) g16 \flamd d8 \flamg g8 d4:32(-> d8.)-> g16 | +} +snareAA = \drummode { + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + \flamg g4 d4:32( d4) r8 +} +snareAB = \drummode { + d8:32(-> g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } \flamd d16. g32-> d16. d32 \flamg g8 | + \flamg g4 d4:32( d4) r8 +} +% Part 2 +snareB = \drummode { + d16. g32 | + d8:32(-> \tuplet 3/2 { g16) d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32-> \tuplet 3/2 { d16 g d } \flamg g8 d4:32(-> d8.)-> g16 | + + d8:32(-> g8) r8 d8:32( g8) g16. d32-> g16. g32 \flamd d8 | + + \flamg g4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly new file mode 100755 index 0000000..2133e85 --- /dev/null +++ b/4-4_marches/51st_highland_division/side.ly @@ -0,0 +1,35 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { + \repeat volta 2 { \part \halfline \break} + \alternative { {\halfline} {\halfline } } + \bar "|." \break + \part \line \bar "||" \break + \line \bar "|." + } + } + { + \snareA + \snareAA s8 + \snareAB s8 + + \snareB + \snareA \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/config.ily b/4-4_marches/flett_from_flotta/config.ily new file mode 100755 index 0000000..0a1c04c --- /dev/null +++ b/4-4_marches/flett_from_flotta/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Flett from Flotta" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/notes.side.ily b/4-4_marches/flett_from_flotta/notes.side.ily new file mode 100755 index 0000000..ee07480 --- /dev/null +++ b/4-4_marches/flett_from_flotta/notes.side.ily @@ -0,0 +1,29 @@ +% 4/4 Flett from Flotta +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d8:32( | + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32)( | + d4) d8:32(-> \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32 \flamd d8 d8:32( | + d4)-> d4:32( d4) d4:32( | + g8.) g16 d8:32( g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 +} +% Part 2 +snareB = \drummode { + d4:32( d8) d32 g d g d32 g d g d8 \flamg g8 d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 d4:32( g8:32)(-> d8:32)(-> | + d4) r4 r4 r4 | + d8.:32(-> g16) d8:32(-> g8)-> d32 g d g d16. g32-> r16 g16-> r16 g16-> | + + g8.:32(-> g16) d8:32(-> g8) d4:32( d8) d8:32( | + g8) \tuplet 3/2 { d16 g d-> } g16. g32 d8 \flamg g4 d8:32( g8:32) | + \flamd d8 \tuplet 3/2 { g16 d g } d8:32(-> g8:32)(-> \tuplet 3/2 { d16) g d } \flamg g8 \flamd d8 g8:32( | + d4)-> d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/flett_from_flotta/side.ly b/4-4_marches/flett_from_flotta/side.ly new file mode 100755 index 0000000..33c6635 --- /dev/null +++ b/4-4_marches/flett_from_flotta/side.ly @@ -0,0 +1,28 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break \line } + \repeat volta 2 { \line \break \line } + + } + { + \snareA s8 + + \snareB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/config.ily b/4-4_marches/minstrel_boy/config.ily new file mode 100755 index 0000000..0670598 --- /dev/null +++ b/4-4_marches/minstrel_boy/config.ily @@ -0,0 +1,20 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Minstrel Boy" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/notes.side.ily b/4-4_marches/minstrel_boy/notes.side.ily new file mode 100755 index 0000000..0c3d098 --- /dev/null +++ b/4-4_marches/minstrel_boy/notes.side.ily @@ -0,0 +1,33 @@ +% 4/4 Minstrel Boy +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + d16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + \break + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} +snareAB = \drummode { + \dragd d16. d32-> g16. g32 | + d4:32( d8.) g16 \flamd d8 d8:32( g8) d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + \break + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + \flamd d8. d16:32( | + g16) g16 d8:32( g16) g16 d8:32( g8:32)( d8) r8 d8:32( | + g16.) d32-> g16. g32 \flamd d8 \flamg g8 d4:32(-> d4:32)(-> | + + d8:32)(-> g8:32)-> r8 d8:32( g8[) \dragd d16. d32]-> g16. g32 \flamd d8 | + \flamd d4 d4:32( d4) +} \ No newline at end of file diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly new file mode 100755 index 0000000..c1d3c30 --- /dev/null +++ b/4-4_marches/minstrel_boy/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \part \line \break + \line \break \bar "|." + + \partial 4 s4 | + \line \break + \line \break \bar "|." + } + { + \snareAA + \snareAB s4 + + \snareBA + \snareAB r8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/config.ily b/4-4_marches/rowan_tree/config.ily new file mode 100755 index 0000000..618eb0f --- /dev/null +++ b/4-4_marches/rowan_tree/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Rowan Tree" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily new file mode 100755 index 0000000..3a89957 --- /dev/null +++ b/4-4_marches/rowan_tree/notes.side.ily @@ -0,0 +1,23 @@ +% 4/4 Rowan Tree +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareEnding = \drummode { + \flamd d8[ d8]:32( g8[) d8]:32( \tuplet 3/2 { g16) d g } \flamd d16. g32 d16. g32-> d g d \flamd d | + d4 d4:32( d4) +} +snareA = \drummode { + r8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d8 g16. d32-> g16. g32 \flamd d16. g32 \flamd d16. d32:128( d16.) g32-> d32 g d \flamd d g8 | + \snareEnding +} +% Part 2 +snareBA = \drummode { + d8. g16 | + d8[:32(-> g8]:32)(-> g8[:32)( d8]:32)(-> g8[:32)( d8]:32)(-> g8[)-> d8]:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8.) g16 | + \snareEnding +} \ No newline at end of file diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly new file mode 100755 index 0000000..552d64c --- /dev/null +++ b/4-4_marches/rowan_tree/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break } + \part \line \bar "||" + } + { + \snareA s4 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/config.ily b/4-4_marches/scotland_the_brave/config.ily new file mode 100755 index 0000000..211da0d --- /dev/null +++ b/4-4_marches/scotland_the_brave/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Scotland the Brave" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily new file mode 100755 index 0000000..6877598 --- /dev/null +++ b/4-4_marches/scotland_the_brave/notes.side.ily @@ -0,0 +1,21 @@ +% 4/4 Scotland the Brave +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareA = \drummode { + d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( g8) d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( | + g8.) g16 d8:32( g8) \flamd d8 d8:32( \tuplet 3/2 { g16) d g } d8 | + \flamd d4 d4:32( d4) r8 +} +% Part 2 +snareBA = \drummode { + g8 | + d4:32( d8) g8 d4:32( d8) g8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d8 | + d4:32( d8) g8 d4:32( d8) g8 | + \flamd d4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly new file mode 100755 index 0000000..5a8db2e --- /dev/null +++ b/4-4_marches/scotland_the_brave/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\part \line \break } + \part \line \bar "||" + } + { + \snareA s8 + + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/config.ily b/4-4_marches/the_leaving_of_liverpool/config.ily new file mode 100755 index 0000000..da97336 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "The Leaving of Liverpool" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly new file mode 100755 index 0000000..6e27158 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/drums.ly @@ -0,0 +1,63 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat volta 2 { \part \line } \break + \part \line \break + \line \bar "|." + } + { + \snareA s4 + + \snareBA + \snareBB + } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + % + % \bassA + % s16 \bassBA \bassBB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + r8 r16 \tenorA s4 + r8 r16 \tenorA + r8 r16 \tenorA + s4 + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.side.ily b/4-4_marches/the_leaving_of_liverpool/notes.side.ily new file mode 100755 index 0000000..468df71 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/notes.side.ily @@ -0,0 +1,33 @@ +% 2/4 Black Bear +% Snare +\version "2.18.2" +composerSnare = "E.T. de Boone, 2015" + +%%music +snareA = \drummode { + r8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + \flamd d4 d4:32( d4) +} +% Part 2 +snareBA = \drummode { + \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) +} +snareBB = \drummode{ + \flamd d4 | + d4:32(\< d4:32)(-> d8)\! d32 g d g d8-> d8:32( | + + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + + \flamg g16. d32:128( d16.) g32 d16.:64( d32) \tuplet 3/2 { g16 d g } \flamd d16. g32-> d32 g d g d16. g32-> d32 g d g | + + d4 d4:32( d4) +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily new file mode 100755 index 0000000..a220de9 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily @@ -0,0 +1,27 @@ +% 4/4 The Leaving of Liverpool +% Tenor +\version "2.18.2" +composerTenor = "F.J. de Boone,2011" + +%%music +tenorA = \drummode { + g16 | + d8[ g] + d[ g] + d[ g] + d[ g] + | + d4 + r8. g16 + d4 + r8. g16 + | + d8[ g] + d[ g] + d[ g] + d[ g] + | + d16 g d g + d g d g + d4 +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly new file mode 100755 index 0000000..b9c7f73 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/side.ly @@ -0,0 +1,30 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line } \break + \part \line \break + \line \bar "|." + + } + { + \snareA s4 + + \snareBA + \snareBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly new file mode 100755 index 0000000..df92d86 --- /dev/null +++ b/4-4_marches/the_leaving_of_liverpool/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \partial 16 s16 \line }} + {\tenorA d4 r8.} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/config.ily b/4-4_marches/the_old_rustic_bridge/config.ily new file mode 100755 index 0000000..a797132 --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/config.ily @@ -0,0 +1,21 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "The Old Rustic Bridge" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/notes.tenor.ily b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily new file mode 100755 index 0000000..d6d261b --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/notes.tenor.ily @@ -0,0 +1,13 @@ +% 4/4 The Olde Rustic Bridge +% Tenor +\version "2.18.2" +composerTenor = "" + +%%music +tenorA = \drummode { + g16 | + d4 g8 d g4 d8. g16 | + d8 g d4 g r | + d4 g8[ d] g[ d] g[ d] | + g4 r4 d4 r4 | +} \ No newline at end of file diff --git a/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly new file mode 100755 index 0000000..284c092 --- /dev/null +++ b/4-4_marches/the_old_rustic_bridge/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat unfold 2 {\repeat volta 2 { \part \line } \break }} + {\repeat unfold 2 {s16\tenorA}} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/config.ily b/4-4_marches/the_pikemans_march/config.ily new file mode 100755 index 0000000..1907399 --- /dev/null +++ b/4-4_marches/the_pikemans_march/config.ily @@ -0,0 +1,19 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +line = { \repeat unfold 4 { s1 | } } + +%% Headers +title = "The Pikeman's March" +meter = "March" + + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly new file mode 100755 index 0000000..a68bdc2 --- /dev/null +++ b/4-4_marches/the_pikemans_march/drums.ly @@ -0,0 +1,68 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.v1.6.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { \repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { \snareAA + \snareAB + s8 + + \snareBA + \snareBB + \snareBC + } + >> + } + %\new PipeBandDrumStaff = "bass" { + % \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + % \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + % + % \bassA + % s16 \bassBA \bassBB + %} + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorAA + \tenorAB + s8 + + s8 + \tenorBA + \tenorBB + \tenorBC + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily new file mode 100755 index 0000000..23e4242 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, 2014" + +%%music +snareAA = \drummode { + g8 | + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d4:32( d4) r8 g8 | +} +snareAB = \drummode { + \flamd d4_^ d32 g d g d8-> \flamd d8 \flamg g8 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> d16. g32 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> g8 | + \flamd d4 d4:32( d4) r8 +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( d8:32)(-> d8:32)( d8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.5.ily b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily new file mode 100755 index 0000000..4671802 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.v1.5.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, v1.5, 2015" + +%%music +snareAA = \drummode { + g16. g32 | + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | + \flamd d8.. g32 \tuplet 3/2 { d16 d g} \flam d16. g32 \tuplet 3/2 { d16 d g } \flam d16. g32 \flam d16. d32 \tuplet 3/2 { g16 g d } + \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | +} +snareAB = \drummode { + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | + \flam d8. g16 d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> d8.)-> \parenthesize d16:64( \parenthesize d8:64) +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.6.ily b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily new file mode 100755 index 0000000..eafdf43 --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.side.v1.6.ily @@ -0,0 +1,39 @@ +% 4/4 The Pikeman's March +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, v1.6, 2015" + +%%music +snareAA = \drummode { + g16. g32 | + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8..) g32 | + \flamd d4 \flamd d16 g-> d d \flamg g16 d-> g g \flamd d16 g-> d d | + \flamd d4 d8:32( g8:32)(-> d4) r8 \tuplet 3/2 { g16\< d g\! } | +} +snareAB = \drummode { + \flamd d4\v d32\< g d g d8->\! \flamd d8\> \flamg g8\! r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 \flamd d16. g32 d32 g d g d8-> g16. g32 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> \tuplet 3/2 { g16 d g} \flam d8 g32 d d g | + \flam d8. g16 d8:32(-> g8:32)(-> d8.)-> d16:64( d8:64) +} +snareBA = \drummode { + d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) g8 | + d8:32( g8:32)(-> d8:32)( g8:32)(-> d8)-> d32 g d g d8-> d16. g32 | + \flamd d4 d8:32( g8:32)(-> d4) \flamd d16 \p g \flamg g d | +} +snareBB = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> \flamd d16.\> g32-> d16. d32\! \flamg g16.\> d32-> g16. g32\! | + \flamd d4 d4:32( d4) r8 d16. g32 | +} + +snareBC = \drummode { + \flamd d8\f \flamg g8 r8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g16.) d32-> g16. g32 d16. g32-> d16. d32 \flamg g8 d8:32( g8) d16. g32 | + d8.:32(-> g16:64)(-> d8:32)(-> g8)-> d32 g d g d16.-> g32-> d32 g d g d8-> | + \flamd d4 d8:32( g8:32)(-> d4) r4 +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily new file mode 100755 index 0000000..628086f --- /dev/null +++ b/4-4_marches/the_pikemans_march/notes.tenor.ily @@ -0,0 +1,41 @@ +% 4/4 The Pikeman's March +% Tenor +\version "2.18.2" +composerTenor = "E.T. de Boone, v0.3, 2015" + +%%music +tenorAA = \drummode { + d16 \< g16 | + d4 \! g8. d16 r8 d16 g d4 + | + d8 g d8 g d4 g4 + | + d4-> r16 d16 r8 r16 g16 r8 r16 d r g + | + d4 d8^\markup{scoop} g d4^\markup{end} r8 +} +tenorAB = \drummode { + d16 \< g16 | + d4 \! g8. d16 r8 d16 g d4 + | + d8 g d8 g d4 g4 + | + d8 g r8 g8 d8 g8 r4 + | + d4 d8^\markup{scoop} g d4^\markup{end} r8 +} +% Part 2 +tenorBA = \drummode { + d8-_ g + d8 g + d8 g + d8 g + | + s1*3 +} +tenorBB = \drummode { + s1*4 +} +tenorBC = \drummode { + s1*4 +} diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly new file mode 100755 index 0000000..6aac954 --- /dev/null +++ b/4-4_marches/the_pikemans_march/side.ly @@ -0,0 +1,32 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.v1.6.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { + \snareAA + \snareAB + s8 + + \snareBA + \snareBB + \snareBC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly new file mode 100755 index 0000000..86e7e61 --- /dev/null +++ b/4-4_marches/the_pikemans_march/tenor.ly @@ -0,0 +1,32 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \part \line \break \line} \break + \part \line \break + \line \break + \line \bar "|." + } + { + \tenorAA + \tenorAB + + s8 + \tenorBA + \tenorBB + \tenorBC + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file 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 new file mode 100755 index 0000000..7f4c476 --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "We're No' Awa Tae Bide Awa" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily new file mode 100755 index 0000000..db5105c --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/notes.side.ily @@ -0,0 +1,19 @@ +% 4/4 We're No Awa Tae Bide Awa +% Snare +\version "2.18.2" +composerSide = "" + +%%music +snareAA = \drummode { + d16. g32 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + \tuplet 3/2 { g16) d g } \flam d16. g32 \tuplet 3/2 { d16 g d } \flam g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flam d8 r8 | + d32-> g d g-> d-> g d g d g d-> g d g d g d-> g d g d-> g d g d8-> d8:32( | + g4) d4:32( d4) r8 g8 | +} +snareAB = \drummode { + d2:32(\< d4)\! r8 g8 | + d8[:32( g8]) g8[ d8]:32( d8[) r8 r8 g8 | + \flam d8 g16. d32-> g16. g32 \flam d16. g32 \flam d16. d32:128( d16) g16-> d16 g d \flam d | + d4 d4:32( d4) r8 +} \ No newline at end of file diff --git a/4-4_marches/were_no_awa_tae_bide_awa/side.ly b/4-4_marches/were_no_awa_tae_bide_awa/side.ly new file mode 100755 index 0000000..484c510 --- /dev/null +++ b/4-4_marches/were_no_awa_tae_bide_awa/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\part \line \break \line \break} + } + { + \snareAA + + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/4-4_marches/wings/config.ily b/4-4_marches/wings/config.ily new file mode 100755 index 0000000..b2554d2 --- /dev/null +++ b/4-4_marches/wings/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +line = { \repeat unfold 2 { s1 | } } + +%% Headers +title = "Wings" +meter = "March" \ No newline at end of file diff --git a/4-4_marches/wings/notes.side.ily b/4-4_marches/wings/notes.side.ily new file mode 100755 index 0000000..9bae983 --- /dev/null +++ b/4-4_marches/wings/notes.side.ily @@ -0,0 +1,28 @@ +% 4/4 Wings +% Snare +\version "2.18.2" +composerSide = "K. Westerkamp, 2003" + +%%music +snareAA = \drummode { + d8:32( \mf | + g8.) \parenthesize d16 d8:32( g8) r8 d32-> \< g d g d-> g d g d8-> \! | + \flamd d8 \f g16. d32-> g16. g32 \flamd d8 d4:32( \< d8) \! d16. g32 | +} +snareABA = \drummode { + d4:32( \< d8) \! \flamg g8 d16 \flamg g8 g16 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d8 d16.[ g32 \dragd d8] d32 g d g d8 d4:32( +} +snareABB = \drummode { + d4:32)( \< d8) \! \flamg g8 d32 g d g d8 d16.[ g32 \dragd d8] | + d32 g d g d8 d4:32( d4) r8 +} +% Part 2 +snareBA = \drummode { + d8:32( | + g8) d16. g32 d16. d32:128( d8) \flamd d8 d16. g32 d8:32(-> \< g8:32)(-> | + d8.)-> \! g16 d8:32( g16.) g32 d8:32( g16.) g32 \tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g d g } | + + \flamd d8 d16. g32-> d16. d32 \flamg g8 \flamd d4 \tuplet 3/2 { d16 \p g d } \flamg g8 | + \flamd d4 r4 d8[:32(-> \< g8]:32)(-> d8[:32)(-> g8]:32)(-> | s256) \! +} \ No newline at end of file diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly new file mode 100755 index 0000000..025f155 --- /dev/null +++ b/4-4_marches/wings/side.ly @@ -0,0 +1,39 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \partial 8 s8 + \repeat volta 2 { + s1 | s1 + } + \alternative { + { s1 | s1 } + { s1 | s2^"Fine" s4 s8 \bar "|."} + } + \partial 8 s8 + s1 + s1 + s1 + s1^"D.C. al Fine" \bar "||" + } + { + \snareAA + \snareABA + \snareABB + \snareBA + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly new file mode 100755 index 0000000..c6a3c6b --- /dev/null +++ b/5-4_marches/cullen_bay/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 { \line } } + { \bassA } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/config.ily b/5-4_marches/cullen_bay/config.ily new file mode 100755 index 0000000..c493eea --- /dev/null +++ b/5-4_marches/cullen_bay/config.ily @@ -0,0 +1,13 @@ +\version "2.19.0" +%% Globals +global = { + \time 5/4 + \eighthBeaming + } +%% Format +part = {\partial 8 s8 } +line = { \repeat unfold 4 { s2 s2. } } + +%% Headers +title = "Cullen Bay" +meter = "March" \ No newline at end of file diff --git a/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly new file mode 100755 index 0000000..6371e96 --- /dev/null +++ b/5-4_marches/cullen_bay/drums.ly @@ -0,0 +1,65 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + { + \repeat unfold 4 { + \line + \break + \line + \bar "|." + } + }%End of Format + { + \repeat unfold 2 { \snareA } + \repeat unfold 2 { \snareB } + \repeat unfold 2 { \snareC } + \repeat unfold 2 { \snareD } + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \repeat unfold 4 { + \bassA + } + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat unfold 4 { + \tenorAA \tenorAB + } + } + >> + \header { + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.bass.ily b/5-4_marches/cullen_bay/notes.bass.ily new file mode 100755 index 0000000..515347c --- /dev/null +++ b/5-4_marches/cullen_bay/notes.bass.ily @@ -0,0 +1,7 @@ +% 5/4 Cullen Bay +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { + \repeat unfold 4 { d4-^ g d-> g d | } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/notes.side.ily b/5-4_marches/cullen_bay/notes.side.ily new file mode 100755 index 0000000..128fa28 --- /dev/null +++ b/5-4_marches/cullen_bay/notes.side.ily @@ -0,0 +1,62 @@ +% 5/4 Cullen Bay +% Side +\version "2.18.2" +composerSide = "" +snareEnd = \drummode { + d8[:32)(-> g16.) g32]-> + d8[:32(-> g8]:32)(-> + d8[:32)( g8]:32)(-> + d4) + d4:32( + | + d8) d8:32( + \triplet { g16)[ d g } \flam d8] + g16. d32-> g16. g32 + \flam d8 d16. g32 -> + d16. d32 \flam g8 + | + \flam d8. d16:64( + d8) d8:32( + \triplet { g16) d g } \flam d8 + d4:32( + d4) +} +snareA = \drummode { + \flam d8.[ g16] + d8[:32( g8]) + \flam d8[ d8]:32( + \triplet { g16[) d g } \flam d16. g32] + \triplet { g16[ d g } \flam g8] + | + \snareEnd +} + +snareB = \drummode{ + \flamd d8[ d16 \flam g16] + r16 g16[ \flam d g]\v + r16 d16[ \flam g8] + \flam d4 + d4:32( + | + \snareEnd +} + +snareC = \drummode{ + \flam d8-> \flam d16-> g-> + d16 d \flam g8 + g8 d8:32( + \triplet { g16) d g } \flam d16. g32 + \triplet { g16 d g } \flam g8 + | + \snareEnd +} + +snareD = \drummode{ + \flam d16. g32 d16. g32-> + d32 g d g d16. g32 + d16. g32-> d32 g d g + d4 + d4:32( + | + \snareEnd +} diff --git a/5-4_marches/cullen_bay/notes.tenor.ily b/5-4_marches/cullen_bay/notes.tenor.ily new file mode 100755 index 0000000..2a38922 --- /dev/null +++ b/5-4_marches/cullen_bay/notes.tenor.ily @@ -0,0 +1,16 @@ +% 5/4 Cullen Bay +% Tenor +\version "2.18.2" +composerTenor = "" +tenorAA = \drummode { + d8-> g d g d-> g d4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d8-> g d g d-> g d8.-> g16-> r8 d8-> | + d4 d4 d8 g8 d4 d4 | +} +tenorAB = \drummode { + d4 g4 d4 g4 d4 | + d8. g16 d8-> g8-> r8 g8 d4 d4 | + d4 g4 d8-> g8 d8.-> g16-> r8 d8-> + d4 d4 d8 g8 d4 d4 | +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/side.ly b/5-4_marches/cullen_bay/side.ly new file mode 100755 index 0000000..0b7d3b5 --- /dev/null +++ b/5-4_marches/cullen_bay/side.ly @@ -0,0 +1,30 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + \repeat volta 1 { \line } \break + } + { + \snareA + \snareB + \snareC + \snareD + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly new file mode 100755 index 0000000..4b1a939 --- /dev/null +++ b/5-4_marches/cullen_bay/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat unfold 1 { \line \line \bar "|."} } + { \tenorAA \tenorAB } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/config.ily b/6-8_marches/hills_of_glenorchy/config.ily new file mode 100755 index 0000000..b017bef --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Hills of Glenorchy" +meter = "March" \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/notes.side.ily b/6-8_marches/hills_of_glenorchy/notes.side.ily new file mode 100755 index 0000000..2d185ac --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/notes.side.ily @@ -0,0 +1,33 @@ +% 6/8 Hills of Glenorchy +% Snare +\version "2.18.2" +composerSnare = "G. Clark, 1977" + +%%music +snareA = \drummode { + d8 | + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> d4.:32( | + d8.) g16 \tuplet 3/2 { \flamd d32 d32 g16 d16 } g16 d16 g16 d16 \tuplet 3/2 { \flamg g32 g32 d16 g16 } | + d16 g16 d16 g16 \flamd d8 \flamg g4 d8 | + + \flamg g4 \flamd d8-> g8 \tuplet 3/2 { d32 g32 d32 } g8.-> | + \tuplet 5/2 { d8 g d g d } g8-> \flamd d8 \tuplet 3/2 { g8 d8 g8 } | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) +} +% Part 2 +snareBA = \drummode { + \tuplet 5/2 { d16 g d g d } | + g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamg g16.d32 g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8. d16 | + g16 d16 \flamg g16 g16 \tuplet 3/2 { d16 g16 d16 } \flamg g8.d16 g8 + + \break + + \flamg g8. d16 g8 d4.:32( | + d16.) g32 d16 g16 d16 g16 d16 g16 d16 g16 d8 | + \flamd d16 d16 g16 d16 g16 d16 \flamg g16 g16 d16 g16 d16 g16:32(-> | + g8.:32)( d16) g8:32(-> d4) +} \ No newline at end of file diff --git a/6-8_marches/hills_of_glenorchy/side.ly b/6-8_marches/hills_of_glenorchy/side.ly new file mode 100755 index 0000000..b7e19df --- /dev/null +++ b/6-8_marches/hills_of_glenorchy/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \halfline \break \halfline } + \repeat volta 2 { \part \halfline \break \halfline } + } + { + \snareA s8 + \snareBA s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/abide_with_me/config.ily b/airs/abide_with_me/config.ily new file mode 100755 index 0000000..9e59ebe --- /dev/null +++ b/airs/abide_with_me/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Abide with Me" +meter = "Hymn" \ No newline at end of file diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily new file mode 100755 index 0000000..b299079 --- /dev/null +++ b/airs/abide_with_me/notes.side.ily @@ -0,0 +1,16 @@ +% 4/4 Abide with Me +% Side +\version "2.18.2" +composerSide = "W.H. de Boone, 2014" +snareAA = \drummode { + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 g | + \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8 \flam g-> | + d4:32( \< d4:32)( d4:32)( d4:32)( \! \> | +} +snareAB = \drummode { + \flam d8->) \! \triplet { d16 g d } g8 \flam d-> r8 \flam d r8 \flam g | + \flam d8->\< \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam d8-> \triplet { d16 g d } \flam g8[ \drag g]->\! | + d4:32( \> d4:32)( d4:32)( d4:32)( | + d4:32)( \< d4:32)( d4:32)( d4:32) \! +} \ No newline at end of file diff --git a/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly new file mode 100755 index 0000000..882b282 --- /dev/null +++ b/airs/abide_with_me/side.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\halfline \break} + \alternative { + { \halfline \break } + { \halfline \bar "|."} + } + + } + { + \snareAA + \snareAA + \snareAB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily new file mode 100755 index 0000000..51fa66c --- /dev/null +++ b/airs/alexander_mackenzie/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Alexander MacKenzie" +meter = "Slow March" \ No newline at end of file diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily new file mode 100755 index 0000000..0df83a0 --- /dev/null +++ b/airs/alexander_mackenzie/notes.side.ily @@ -0,0 +1,36 @@ +% 6/8 Alexander MacKenzie +% Side +\version "2.18.2" +composerSide = "" +snareAA = \drummode { + d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4.:32( | + + d4) d16. g32 d8:32( d8) g8 | + \flamd d16. g32 d16. \flamg g32 d16. g32 \flamd d4 +} +snareAB = \drummode { + d16. g32 | + d8:32( d8.)-> g16 d4:32( d8) | + \dragd d16. d32-> g16. g32 \flamd d8 d4:32( d16.) g32 | + + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) +} +snareBA = \drummode { + d8:32( | + g4) \flamd d16. g32 d8:32( d8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> d8:32( + + g4) \flamd d16. g32 d8:32( d8.) g16 | + d4.:32( d4) +} +snareBB = \drummode { + d8:32( | + g4) \flamd d16. g32 d8:32( d8) \flamd d8 | + d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 | + + d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 | + d4.:32( d4) +} diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly new file mode 100755 index 0000000..bfabc04 --- /dev/null +++ b/airs/alexander_mackenzie/side.ly @@ -0,0 +1,31 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break } \break + \repeat volta 2 { \part \halfline \break } + \alternative{ {\part \halfline \break}{\part \halfline \break} } + \bar "|." + } + { + \snareAA \snareAB s8 + + \snareBA s8 + \snareBB s8 + \snareAB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} diff --git a/airs/amazing_grace/config.ily b/airs/amazing_grace/config.ily new file mode 100755 index 0000000..f632530 --- /dev/null +++ b/airs/amazing_grace/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 3/4 + } + +%% Format +part = { \partial 4 s4 } +halfline = { \repeat unfold 2 { s4*3 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Amazing Grace" +meter = "Hymn" \ No newline at end of file diff --git a/airs/amazing_grace/notes.side.ily b/airs/amazing_grace/notes.side.ily new file mode 100755 index 0000000..1de8d94 --- /dev/null +++ b/airs/amazing_grace/notes.side.ily @@ -0,0 +1,31 @@ +% 3/4 Amazing Grace +% Side +\version "2.18.2" +composerSide = "" +snarePart = \drummode { + \flamd d8. g16 | +} +snareAA = \drummode { + \flamd d2)\! \flamd d8 g16 d16 | + \flamd d2 \flamd d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | +} +snareAB = \drummode { + \flamd d2 \flamd d8 g16 d16 | + \flamd d2 \flamd d8. \flamg g16-> | + d4:32(\< d4:32)( d4:32)(\> | + d4:32)(\! d4:32)( d4:32)(\< | +} +snareAC = \drummode { + d2->)\! d8 g16 d16 | + \flamd d2 d8. g16 | + d4:32( d4:32)( d4:32)(\> | + d2)\! \flamd d8. g16 | +} +snareAD = \drummode { + \flamd d2 d8 g16 d16 | + \flamd d2 \dragd d4 | + d4:32(\> d4:32)( d4:32)(\! | + d4:32)( d4:32)(\< d4:32)( +} \ No newline at end of file diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly new file mode 100755 index 0000000..0600314 --- /dev/null +++ b/airs/amazing_grace/side.ly @@ -0,0 +1,34 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \part + \repeat volta 2{ + \line \break + \line \break + \line \break + \line \break + } + } + { + \snarePart + \snareAA + \snareAB + \snareAC + \snareAD + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/config.ily b/airs/farewell_to_camraw/config.ily new file mode 100755 index 0000000..94eb300 --- /dev/null +++ b/airs/farewell_to_camraw/config.ily @@ -0,0 +1,13 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \eighthBeaming + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s1 } } \break } + +%% Headers +title = "Farewell to Camraw" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly new file mode 100755 index 0000000..56172bd --- /dev/null +++ b/airs/farewell_to_camraw/drums.ly @@ -0,0 +1,50 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + \formatA + \snareA + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + %\bassA + %\bassB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorA + } + >> + \header { + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.side.ily b/airs/farewell_to_camraw/notes.side.ily new file mode 100755 index 0000000..da799f2 --- /dev/null +++ b/airs/farewell_to_camraw/notes.side.ily @@ -0,0 +1,14 @@ +% 4/4 Farewell to Camraw +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + r1 | + r1 | + \flamd d8 g8 \flamd d32 g d g d g d g d16.-> g32 d32 g d g d16 g d g | + \flamd d4 r4 r8 \flamd d32 g d g d16-> g d g | + \flamd d4 d32 g d g d g d g d4 r4 | + \flamd d4 \flamd d8 \flamg g8 d4 d32 g d g d g d g | + d16 g \flamd d32 g d g \flamd d16 g d32 g d g d8 d32 g d g d16 g d g | + \flamd d8 \flamg g8 r4 r2 +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/notes.tenor.ily b/airs/farewell_to_camraw/notes.tenor.ily new file mode 100755 index 0000000..a109de9 --- /dev/null +++ b/airs/farewell_to_camraw/notes.tenor.ily @@ -0,0 +1,15 @@ +% 4/4 Farewell to Camraw +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { + R1 + r8 g d16 g d g d8 g d16 g d g | + d8 g d16 g d g d4 d16 g d g | + d4 g16 d g d d4 r4 | + d4 d8 g d4 r4 | + d4 d8 g d4 r4 | + d8 g d g d4 d8 g | + d8 g r4 r2 | + +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly new file mode 100755 index 0000000..88a31ab --- /dev/null +++ b/airs/farewell_to_camraw/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \snareA + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly new file mode 100755 index 0000000..ce31ef0 --- /dev/null +++ b/airs/farewell_to_camraw/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \formatA + \tenorA + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily new file mode 100755 index 0000000..9d30712 --- /dev/null +++ b/airs/flower_of_scotland/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Flower of Scotland" +meter = "Air" \ No newline at end of file diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily new file mode 100755 index 0000000..b702d19 --- /dev/null +++ b/airs/flower_of_scotland/notes.side.ily @@ -0,0 +1,26 @@ +% 6/8 Flower of Scotland +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + g8 | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + + d4.:32( d4.) | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d8 g d | + + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + d4.:32( d4.) | + \flam d8 d:32( g) \flam d8 g16. d32 g16. g32 | + \flam d8 g16. d32 g16. g32 \flam d4 +} \ No newline at end of file diff --git a/airs/flower_of_scotland/side.ly b/airs/flower_of_scotland/side.ly new file mode 100755 index 0000000..05b1c0f --- /dev/null +++ b/airs/flower_of_scotland/side.ly @@ -0,0 +1,24 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 { + \part + \repeat unfold 4 { \line \break } + } + } + { \snareA s8 } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/loch_duich/config.ily b/airs/loch_duich/config.ily new file mode 100755 index 0000000..21973bf --- /dev/null +++ b/airs/loch_duich/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Loch Duich" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily new file mode 100755 index 0000000..2c76ef3 --- /dev/null +++ b/airs/loch_duich/notes.side.ily @@ -0,0 +1,46 @@ +% 6/8 Loch Duich +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareB = \drummode { + d4)\! g8 d8:32( d8) g8 | + d8:32( d8) g8 \dragd d16 d-> g g \flamd d8 | + + \flamg g4 g8 d8:32( d8) g8 | + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + \flamd d4 \flamd d8 d16:64( d8) d16:64( d8) | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | + + \flamg g8 d8:32( d8) r8 d8:32( d8) | + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareCA = \drummode { + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d8 g16 d-> g g d4.:32(\< | + + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 + d4:32( g8:32)(-> \tuplet 3/2 { d16) g d-> } g16 g \flamd d8 | + + d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d4:32( d8) \dragd d16 d-> g g \flamd d8 | +} +snareCBA = \drummode { + \dragd d16 d-> g g \flamd d8 d4.:32(\< | +} +snareCBB = \drummode { + \dragd d16)\! d-> g g \flamd d8 \flamd d4. | +} \ No newline at end of file diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly new file mode 100755 index 0000000..1d78b2d --- /dev/null +++ b/airs/loch_duich/side.ly @@ -0,0 +1,33 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line \break} + \repeat volta 2 { \line \break} + \repeat volta 2 { \halfline s2. s2.} + \alternative { + { s2.} {s2.} + } + } + { + \snareA + \snareB + \snareCA + \snareCBA + \snareCBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/miss_kirkwood/config.ily b/airs/miss_kirkwood/config.ily new file mode 100755 index 0000000..e722bbd --- /dev/null +++ b/airs/miss_kirkwood/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Miss Kirkwood" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/miss_kirkwood/notes.side.ily b/airs/miss_kirkwood/notes.side.ily new file mode 100755 index 0000000..949703e --- /dev/null +++ b/airs/miss_kirkwood/notes.side.ily @@ -0,0 +1,25 @@ +% 6/8 Miss Kirkwood +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + d4.:32( d4) g8 | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + d2.:32(\< | + + d8)\! \flamg g8. g16 d4:32( d8) | + d8:32( d8.) g16 d4.:32( | + d8) \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4.) +} +snareB = \drummode { + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( \tuplet 3/2 { d16) g d } \flamg g8 | + \dragd d16 d16-> g16 g16 \flamd d8 d8:32( d8) g8 | + d4:32( d8) g8 d8:32( d8) | + \flamd d8 g16 d16-> g16 g16 d4.:32(\< | + d8)\! \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16) d16-> g16 g16 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/airs/miss_kirkwood/side.ly b/airs/miss_kirkwood/side.ly new file mode 100755 index 0000000..12e7762 --- /dev/null +++ b/airs/miss_kirkwood/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 {\line \break} + \repeat volta 2 {\line \break} + } + { + \snareA + \snareB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly new file mode 100755 index 0000000..877f709 --- /dev/null +++ b/airs/morag_of_dunvegan/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\bassA \bassB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily new file mode 100755 index 0000000..b6ac8da --- /dev/null +++ b/airs/morag_of_dunvegan/config.ily @@ -0,0 +1,18 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break } + +%% Headers +title = "Morag of Dunvegan" +meter = "Slow Air" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly new file mode 100755 index 0000000..aab186d --- /dev/null +++ b/airs/morag_of_dunvegan/drums.ly @@ -0,0 +1,51 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + { \formatA \formatB } + { \snareA \snareB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassA + \bassB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorA + \tenorB + } + >> + \header { + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.bass.ily b/airs/morag_of_dunvegan/notes.bass.ily new file mode 100755 index 0000000..fc0d790 --- /dev/null +++ b/airs/morag_of_dunvegan/notes.bass.ily @@ -0,0 +1,23 @@ +% 6/8 Morag of Dunvegan +% Bass +\version "2.18.2" +bassA = \drummode { + d4. d8 r8 g8 | + d4. d8 g8 d8 | + d4. g8 d8 g8 | + d8 r8 g8 d4. | + d4. d8 r8 g8 | + d4. d8 g8 d8 | + d4. g8 d8 g8 | + d8 r8 g8 d4. | +} +bassB = \drummode { + d4. g4. | + d4. g4. | + d4. g8 d8 g8 | + d4 g8 d4. | + d4. g4. | + d4. g4. | + d4 g8 d4 g8 | + d8 g8 d8 g4. | +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.side.ily b/airs/morag_of_dunvegan/notes.side.ily new file mode 100755 index 0000000..fac7c73 --- /dev/null +++ b/airs/morag_of_dunvegan/notes.side.ily @@ -0,0 +1,30 @@ +% 6/8 Morag of Dunvegan +% Tenor +\version "2.18.2" +snareA = \drummode { + \flamd d8 d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) g8 \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 r8 d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d8)\! d8:32( g8) \flamd d8 r8 \flamd d8 | + g8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) +} + +snareB = \drummode { + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16.-> g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + + d16.-> g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + \tuplet 3/2 { d16 g d } g8 \flamd d8 d4.:32(\< | + + d16.)->\! g32 d16. d32 g8 d8:32(-> g8) \flamd d8 | + d16. g32 d16. d32 g8 \flamd d8-> \tuplet 3/2 { d16 g d } g8 | + + \flamd d8 d8:32( g8) \flamd d8 g16. d32-> g16. g32 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/notes.tenor.ily b/airs/morag_of_dunvegan/notes.tenor.ily new file mode 100755 index 0000000..6e5e020 --- /dev/null +++ b/airs/morag_of_dunvegan/notes.tenor.ily @@ -0,0 +1,29 @@ +% 6/8 Morag of Dunvegan +% Tenor +\version "2.18.2" +tenorA = \drummode { + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4. | + + d8 r8 g8 d8 g8 d8 | + g8 r8 d8 g4. | + + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4.| + + d4 g8 d4 g8 | + d8 g8 d8 g4. +} +tenorB = \drummode { + d8 g8 d8 g8 d8 g8 | + d4. g4. | + + d8 g8 d8 g8 d8 g8 | + d4 g8 d4.| + + d8 g8 d8 g8 d8 g8 | + d4. g4. | + + d8 g8 d8 g8 d8 g8 | + d8 g8 d8 g4. +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly new file mode 100755 index 0000000..e51dc55 --- /dev/null +++ b/airs/morag_of_dunvegan/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\snareA \snareB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly new file mode 100755 index 0000000..aade5e1 --- /dev/null +++ b/airs/morag_of_dunvegan/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\tenorA \tenorB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/airs/my_home/config.ily b/airs/my_home/config.ily new file mode 100755 index 0000000..ad9fc49 --- /dev/null +++ b/airs/my_home/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "My Home" +meter = "Slow Air" \ No newline at end of file diff --git a/airs/my_home/drums.ly b/airs/my_home/drums.ly new file mode 100755 index 0000000..3eb253f --- /dev/null +++ b/airs/my_home/drums.ly @@ -0,0 +1,54 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat volta 2 { \part \line \break} + \repeat volta 2 { \part \line \break} + } + { + \snareA s8 + \snareB s8 + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \repeat unfold 2 { s8 \tenorA } + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/airs/my_home/notes.bass.ily b/airs/my_home/notes.bass.ily new file mode 100755 index 0000000..7eb7ef5 --- /dev/null +++ b/airs/my_home/notes.bass.ily @@ -0,0 +1,6 @@ +% 6/8 My Home +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily new file mode 100755 index 0000000..ca8b4b2 --- /dev/null +++ b/airs/my_home/notes.side.ily @@ -0,0 +1,26 @@ +% 6/8 My Home +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + d8:32( | + g8.) d16 g8 \flamd d8. g16 d8 | + \flamg g8. d16 g8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) +} +snareB = \drummode { + d8 | + \flamd d8. g16 d8 d4.:32( + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamg g8. d16 g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d8. g16 d8 \flamg g8. d16 g8 | + d4.:32( d4) +} \ No newline at end of file diff --git a/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily new file mode 100755 index 0000000..ab14c75 --- /dev/null +++ b/airs/my_home/notes.tenor.ily @@ -0,0 +1,15 @@ +% 6/8 My Home +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { + d4 d8 g8. d16 g8 | + d4. g4 d8 | + d4. g4 d8 | + d8. g8 d16 d4.| + + d8. g16 d8 g4. | + d4 d8 g4. | + r8 g8 d8 r8 d8 g8 + d8 g8 d8 g4. +} \ No newline at end of file diff --git a/airs/my_home/side.ly b/airs/my_home/side.ly new file mode 100755 index 0000000..b97df0f --- /dev/null +++ b/airs/my_home/side.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \part \line \break} + \repeat volta 2 { \part \line \break} + } + { + \snareA s8 + \snareB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/my_home/tenor.ly b/airs/my_home/tenor.ly new file mode 100755 index 0000000..da4d91d --- /dev/null +++ b/airs/my_home/tenor.ly @@ -0,0 +1,26 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat volta 2 { \line \break} + \repeat volta 2 { \line \break} + + } + { + \repeat unfold 2 { \tenorA } + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily new file mode 100755 index 0000000..cabb9bf --- /dev/null +++ b/airs/the_mist_covered_mountains/config.ily @@ -0,0 +1,19 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +part = {\partial 8 s8 } +%% Format +formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } +formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break } + +%% Headers +title = "The Mist Covered Mountains" +meter = "Slow Air" + +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly new file mode 100755 index 0000000..6e7918c --- /dev/null +++ b/airs/the_mist_covered_mountains/drums.ly @@ -0,0 +1,51 @@ +\version "2.19.0" + +\include "config.ily" +%\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + {\formatA \formatB } + {\snareA \snareB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + %\bassA + %\bassB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorA + \tenorB + } + >> + \header { + title = \title + meter = \meter + composer = \markup \tiny { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily new file mode 100755 index 0000000..bd59aa5 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.side.ily @@ -0,0 +1,23 @@ +\version "2.18.2" +snareA = \drummode { + \partial 8 d8:32( | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8[ r8 d8:32(] | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d8)[ r8 d8:32(] | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8 r8 d8:32( | + g8.) d16 g8 d8. g16 d8 | + d4.:32( d4.) | +} +snareB = \drummode { + \partial 8 d8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + d2.:32( | + d8.)-> g16 d8 g8 r8 g8 | + d2.:32( | + d8.)-> g16 d8 g8. d16 g8 | + r8 g8 d8 r8 d8 g8 | + d4.:32( d4.) | +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily new file mode 100755 index 0000000..fe1b048 --- /dev/null +++ b/airs/the_mist_covered_mountains/notes.tenor.ily @@ -0,0 +1,25 @@ +% 6/8 The Mist Covered Mountains +% Tenor +\version "2.18.2" +tenorA = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8. g16 d8 g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g8. d16 g8 | + d8 g8 d8 g8 r4 +} +tenorB = \drummode { + \partial 8 s8 + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + d4. g | + d4. g8 r8 g8 | + r8. g16 d8 r8. d16 g8 | + d8 g8 d8 g8 r4 +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly new file mode 100755 index 0000000..bcc942a --- /dev/null +++ b/airs/the_mist_covered_mountains/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\snareA \snareB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly new file mode 100755 index 0000000..9231675 --- /dev/null +++ b/airs/the_mist_covered_mountains/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\formatA \formatB} + {\tenorA \tenorB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/book/.gitignore b/book/.gitignore new file mode 100644 index 0000000..86753b4 --- /dev/null +++ b/book/.gitignore @@ -0,0 +1,7 @@ +*.pdf +*.aux +*.log +*.toc +images/* +scores/* +tmp/* diff --git a/book/bass_book.tex b/book/bass_book.tex new file mode 100644 index 0000000..52b951d --- /dev/null +++ b/book/bass_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Scores Bass} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_bass.tex} +\end{document} diff --git a/book/clean b/book/clean new file mode 100644 index 0000000..936460e --- /dev/null +++ b/book/clean @@ -0,0 +1,2 @@ +#!/bin/sh +rm -v *.log *.aux *.pyc diff --git a/book/drums_book.tex b/book/drums_book.tex new file mode 100644 index 0000000..5c0a96c --- /dev/null +++ b/book/drums_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Drumscores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_drums.tex} +\end{document} diff --git a/book/full_book.tex b/book/full_book.tex new file mode 100644 index 0000000..6f171bc --- /dev/null +++ b/book/full_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Fullscores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_full.tex} +\end{document} diff --git a/book/init b/book/init new file mode 100644 index 0000000..4e9ffc9 --- /dev/null +++ b/book/init @@ -0,0 +1,50 @@ +#!/bin/bash + +SHELLCMD='sh' +PYTHONCMD='python3.4' +LATEXCMD='pdflatex' + +#$SHELLCMD load_scores + +#$PYTHONCMD makebook -o tex/main_full.tex full +#$PYTHONCMD makebook -o tex/main_drums.tex drums +#$PYTHONCMD makebook -o tex/main_pipes.tex pipes +#$PYTHONCMD makebook -o tex/main_bass.tex bass +#$PYTHONCMD makebook -o tex/main_tenor.tex tenor +#$PYTHONCMD makebook -o tex/main_side.tex side snare + +for ins in tenor; +do + printf "\\documentclass{tex/score_book} + + \\title{Seaforth Highlanders of Holland\\\\ %s Scores} + \\author{Eric Teunis de Boone} + +\\begin{document} + +\\input{./tex/titlepage.tex} + +\\newpage +\\cleardoublepage +\\phantomsection +\\addcontentsline{toc}{section}{\contentsname} +\\begin{multicols}{2} + \\tableofcontents +\\end{multicols} + +%\\newpage +%\\input{./tex/playlist} +\\newpage +\\input{./tex/main_%s.tex} +\\end{document} +" "$instr" "$instr" +done; + +echo "All setup!" + +#read -p "Press [Enter] to compile *.tex" + +#for f in ./*.tex; +#do +# $LATEXCMD $f +#done; diff --git a/book/load_scores b/book/load_scores new file mode 100644 index 0000000..3bf4203 --- /dev/null +++ b/book/load_scores @@ -0,0 +1,34 @@ +#!/bin/bash +MKDRUM_DIR="../" +MKDRUMCOMMAND=$MKDRUM_DIR"makedrum" +SCORES_DIR="./scores/" + +trap "echo Aborted!; exit;" SIGINT SIGTERM + +another_dir () { + d=$1 + for f in $d/* + do + if [ -d $f ]; then + another_dir $f + continue + fi + + if [ ! -f $f ]; then + continue + fi + + if [[ ! "$f" == *.ly ]]; then + continue + fi + + mkdir -p $SCORES_DIR${d/$MKDRUM_DIR} + #echo $SCORES_DIR${f/$MKDRUM_DIR} + $MKDRUMCOMMAND $f -d $SCORES_DIR${d/$MKDRUM_DIR} + done; +} + +for d in ${MKDRUM_DIR}*_marches ${MKDRUM_DIR}strathspeys ${MKDRUM_DIR}standards ${MKDRUM_DIR}jigs ${MKDRUM_DIR}airs ${MKDRUM_DIR}hornpipes ${MKDRUM_DIR}other +do + another_dir $d +done; diff --git a/book/makebook b/book/makebook new file mode 100644 index 0000000..5c8747b --- /dev/null +++ b/book/makebook @@ -0,0 +1,180 @@ +#!/usr/bin/python3.4 + +# To be Run: python3.4 makebook -v -o ./tex/main_pipes.tex pipes +# Uses a copy of the filestructure of pipeband-drumming to generate the body of a tex file + +import os +from argparse import ArgumentParser + +class MakeBook: + OUT = './tex/main.tex' + MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) + RUN_DIR = os.path.abspath(os.curdir) + SCORES_DIR = './scores/' + LY_DIR = '../' + ORDER_FILE = 'order.txt' + INSTRUMENTS = ['full','drums', 'pipes', 'bass', 'tenor', 'side','snare'] + def __init__(self): + + usage = __file__ + parser = ArgumentParser(usage) + parser.add_argument('-v','--verbose',default=False,action='store_true',dest='verbose', help='verbose') + parser.add_argument('instrument',default=False,nargs='*',help='Instruments to be included in the book') + parser.add_argument('-o','--output',default=self.OUT,help='Output file') + + self.args = parser.parse_args() + + if self.args.verbose: + self.vprint('Verbose output') + standards = ['standards'] + marches = ['2-4_marches', '3-4_marches', '4-4_marches', '5-4_marches', '6-8_marches'] + watch_folders = [ 'hornpipes', 'jigs', 'strathspeys', 'reels','other'] + watch_folders = marches + watch_folders + + # Run Path_walker over dirs + tune_dirs = [] + for d in watch_folders: + if d in marches: + continue + tune_dirs.append(d) + + # Ready f.out + try: + self.fout = open(self.args.output,'w+') + + self.fwrite(u'\\addcontentsline{toc}{section}{Standards}') + for d in standards: + self.vprint() + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=1) + self.fwrite(u'\\addcontentsline{toc}{section}{Marches}') + for d in marches: + self.vprint() + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=2) + + for d in tune_dirs: + self.vprint() + self.vprint(os.path.join(self.SCORES_DIR,d)) + self.path_walker(os.path.join(self.SCORES_DIR,d)) + except IOError: + print('Cannot open {}'.format(self.OUT)) + except: + self.fout.close() + raise + + def vprint(self,line = None): + if self.args.verbose: + if line is None: + line = '' + print(line) + + def fwrite(self,line): + self.fout.write(line+'\n') + + def include_pdf (self,file, level): + title = False + self.vprint(file) + lilydir = file[:file.rfind('/')].replace(self.SCORES_DIR,self.LY_DIR) + if os.path.isdir(lilydir): + path = file[:file.rfind('/')] + #Try to load title from config file + if os.path.isfile(os.path.join(lilydir,'config.ily')): + self.vprint('Loading config file') + with open(os.path.join(lilydir,'config.ily'),'r') as f: + for line in iter(f): + if line.startswith('title'): + title = line[line.find('=')+1:]#Strip 'title=' + title = title[1:-1] #Strip Quotes + continue + + lilyfile = os.path.join(lilydir, file[file.rfind('-')+1:].replace('.pdf','.ly')) + if not title and os.path.isfile(lilyfile): + self.vprint('Look through lilyfile') + with open(lilyfile, 'r') as f: + for line in iter(f): + if line.strip().startswith('title'): + title = line[line.find('=')+1:]#Strip 'title=' + title = title[1:-1] #Strip Quotes + continue + if title: + ref = title + forbid = ' /!@#$%^&*()<>?\|;:\'"' + for s in forbid: + ref = ref.replace(s,'_') + if not title: + self.vprint('No title yet Found!') + last_slash = file.rfind('/') + last_dot = file.rfind('.') + + if file[file.rfind('.',0,last_dot)+1:file.rfind('.')] in self.INSTRUMENTS: + ref = file[file.rfind('/')+1:file.rfind('.')] + else : + ref = file[file.rfind('/',0,last_slash-1)+1:file.rfind('.')].replace('/','-') + # Make title from filename + title = ref + #Remove references to Instruments + for inst in self.INSTRUMENTS: + title = title.replace('-'+inst, '') + title = title.replace('.'+inst, '') + #Remove chars + title = title.replace('-','').replace('_',' ').title() + + title = title[1:-1].replace('\\n',' ') + + if not self.args.instrument: + for inst in self.INSTRUMENTS: + if inst in file: + title = title + ' ('+inst+')' + self.vprint('= '+title) + ref = 'p'+ref.strip('_').lower() + #string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+','+title+','+ref+'}, pagecommand={}]{'+file+'}' + string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+',{'+title+'},'+ref+'}, pagecommand={}]{'+file+'}' + + self.fwrite(string) + return string + + def path_walker(self, a, level=None, content_line_level=None): + if not a: + return + if level is None: + level = 0 + if content_line_level is None: + content_line_level = 1 + # Do stuff + if level < content_line_level: + self.fwrite(u'\\mysection{'+('sub'*level)+'section}{'+a[a.rfind('/')+1:].replace('_',' ').replace('-','/').title()+'}') + newline = False + + if os.path.isfile(os.path.join(a, 'order.txt')): + self.vprint('Found order') + with open(os.path.join(a, self.ORDER_FILE)) as f: + line = f.readline().rstrip('\n') + while line: + self.path_walker(os.path.join(a,line), level+1) + line = f.readline().rstrip('\n') + else: + for root, dirs, files in os.walk(a,False): + for f in files: + if not f.endswith('.pdf'): + self.vprint('F! '+f) + continue + if self.args.instrument: + instr_in_file = False + for instr in self.args.instrument: + if instr in f: + self.vprint(instr) + instr_in_file = True + break + if not instr_in_file: + self.vprint('F! '+f) + continue + # Include file + self.vprint('F '+f) + if newline: + self.fwrite(u'\\newpage') + + newline = True + self.include_pdf(os.path.join(root,f), level+1) +# Run above +MakeBook(); diff --git a/book/pipes_book.tex b/book/pipes_book.tex new file mode 100644 index 0000000..e0d65e6 --- /dev/null +++ b/book/pipes_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Pipe Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_pipes.tex} +\end{document} diff --git a/book/side_book.tex b/book/side_book.tex new file mode 100644 index 0000000..f4fc484 --- /dev/null +++ b/book/side_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Side Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_side.tex} +\end{document} diff --git a/book/tenor_book.tex b/book/tenor_book.tex new file mode 100644 index 0000000..ce5678b --- /dev/null +++ b/book/tenor_book.tex @@ -0,0 +1,22 @@ +\documentclass{tex/score_book} + +\title{Seaforth Highlanders of Holland\\Tenor Scores} +\author{Eric Teunis de Boone} + +\begin{document} + +\input{./tex/titlepage.tex} + +\newpage +\cleardoublepage +\phantomsection +\addcontentsline{toc}{section}{\contentsname} +\begin{multicols}{2} + \tableofcontents +\end{multicols} + +%\newpage +%\input{./tex/playlist} +\newpage +\input{./tex/main_tenor.tex} +\end{document} diff --git a/book/tex/main_bass.tex b/book/tex/main_bass.tex new file mode 100644 index 0000000..2062be1 --- /dev/null +++ b/book/tex/main_bass.tex @@ -0,0 +1,17 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/book/tex/main_drums.tex b/book/tex/main_drums.tex new file mode 100644 index 0000000..2529961 --- /dev/null +++ b/book/tex/main_drums.tex @@ -0,0 +1,20 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/book/tex/main_full.tex b/book/tex/main_full.tex new file mode 100644 index 0000000..f7b6de8 --- /dev/null +++ b/book/tex/main_full.tex @@ -0,0 +1,13 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/book/tex/main_pipes.tex b/book/tex/main_pipes.tex new file mode 100644 index 0000000..06b3d59 --- /dev/null +++ b/book/tex/main_pipes.tex @@ -0,0 +1,14 @@ +\addcontentsline{toc}{section}{Standards} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\mysection{subsection}{4/4 Marches} +\mysection{subsection}{5/4 Marches} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} +\mysection{section}{Jigs} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/book/tex/main_side.tex b/book/tex/main_side.tex new file mode 100644 index 0000000..d3a0555 --- /dev/null +++ b/book/tex/main_side.tex @@ -0,0 +1,58 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} +\mysection{subsection}{3/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} +\mysection{subsection}{6/8 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} +\mysection{section}{Hornpipes} +\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} +\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/book/tex/main_tenor.tex b/book/tex/main_tenor.tex new file mode 100644 index 0000000..1e034a4 --- /dev/null +++ b/book/tex/main_tenor.tex @@ -0,0 +1,24 @@ +\addcontentsline{toc}{section}{Standards} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} +\addcontentsline{toc}{section}{Marches} +\mysection{subsection}{2/4 Marches} +\mysection{subsection}{3/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} +\mysection{subsection}{4/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} +\mysection{subsection}{5/4 Marches} +\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} +\mysection{subsection}{6/8 Marches} +\mysection{section}{Hornpipes} +\mysection{section}{Jigs} +\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} +\mysection{section}{Strathspeys} +\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} +\newpage +\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} +\mysection{section}{Reels} +\mysection{section}{Other} diff --git a/book/tex/score_book.cls b/book/tex/score_book.cls new file mode 100644 index 0000000..635ca0e --- /dev/null +++ b/book/tex/score_book.cls @@ -0,0 +1,36 @@ +\LoadClass{article} +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{score_book} +% +% Load packages +\RequirePackage[a4paper,margin=1in,landscape]{geometry} +\RequirePackage{pdfpages}%Includepdf +\RequirePackage{amsmath} +\RequirePackage{graphicx} +\RequirePackage{grffile} +\RequirePackage[dutch]{babel} +\RequirePackage{multicol}%Needed for toc +\RequirePackage{bookmark}%Needed for bookmark to toc +\RequirePackage{background} + \backgroundsetup{scale=0.7} + \backgroundsetup{angle=0} + \backgroundsetup{opacity=0.1} + \backgroundsetup{contents={\includegraphics[width=\textheight]{./images/seaforth_capbadge.jpg}}} +\RequirePackage{hyperref} + \hypersetup{colorlinks=false} +\RequirePackage{tocloft} +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{naturalnames}{hyperref} +%\RequirePackage{chngpage} +% +% (Re)Set counters +\setcounter{secnumdepth}{-2}%Hides section no's +% +% Define commands +\newcommand{\mysection}[2]{ + \phantomsection + \stepcounter{#1} + \addtocontents{toc}{\cftpagenumbersoff{#1}}%cft for disabling page numbering + \addcontentsline{toc}{#1}{#2} + \addtocontents{toc}{\cftpagenumberson{#1}}%cft for enabling page numbering +} diff --git a/book/tex/titlepage.tex b/book/tex/titlepage.tex new file mode 100644 index 0000000..341ac10 --- /dev/null +++ b/book/tex/titlepage.tex @@ -0,0 +1,6 @@ +\NoBgThispage +\maketitle +\begin{center} +\includegraphics[width=0.3\textwidth]{./images/SEAFORTH_logo_PMS.pdf} +\end{center} + diff --git a/build_all b/build_all new file mode 100755 index 0000000..1d8b2ac --- /dev/null +++ b/build_all @@ -0,0 +1,14 @@ +#!/bin/bash + +MKDRUMCOMMAND="./makedrum" + +for d in *_marches strathspeys standards jigs airs hornpipes other +do + for f in $d/*.ly $d/*/*.ly + do + if [ ! -f $f ] ; then + continue + fi + $MKDRUMCOMMAND $f + done; +done; diff --git a/cheatsheet.ly b/cheatsheet.ly index cc03f66..4f52497 100755 --- a/cheatsheet.ly +++ b/cheatsheet.ly @@ -98,28 +98,7 @@ "d8:32(" "\\triplet " -- "\\flam d16." "g32" -- "\\drag g16" -- "\\triplet" "g:64" "d-> }" } } -\score { - \new PipeBandDrumStaff { - \drummode { - \time 6/8 - \repeat volta 2 { - \partial 8 d8:32(_"7" | - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16 g8 d4.:32(_"13" | - d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | - \break - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | - d8.:32(_"5" d16) \flamg g8 \flamd d4 \fr | - } - } - } - \header { - title = "And now for something completely standard" - } -} + % # Writing parts % rolls % tuplets diff --git a/example.ly b/example.ly new file mode 100755 index 0000000..ff1c9f1 --- /dev/null +++ b/example.ly @@ -0,0 +1,24 @@ +\version "2.18.2" +% include the lilydrum file +\include "lilydrum.ly" + +% Now a tiny example : +\score { + \new DrumStaff { + \drummode { + \time 6/8 + \partial 8 d8:32(_"7" | + \repeat volta 2 { + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \flamddr d8. d16 g8 d4.:32(_"13" | + d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | + \break + g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | + g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | + \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | + d8.:32(_"5" d16) \flamg g8 \flamd d4. \fr | + } + } + } +} \ No newline at end of file diff --git a/header_book.ily b/header_book.ily new file mode 100755 index 0000000..6e0e8e1 --- /dev/null +++ b/header_book.ily @@ -0,0 +1,42 @@ +%{ + Header formatting for tunes. Customize to get your name in the tag line. +%} + +\version "2.16.0" + +today = #(strftime "%B %e, %Y" (localtime (current-time))) + +\paper { + raggedbottom = ##t + tagline = \markup { + \line { + "Cpl ET de Boone, Seaforths of Holland," + \concat { "(rev. " \today ")" } + } + } + bookTitleMarkup = \markup { + \override #'(baseline-skip . 3.5) + \column { + \fill-line { \fromproperty #'header:dedication } + \override #'(baseline-skip . 3.5) + \column { + \huge \larger \bold + \fill-line { + \larger \fromproperty #'header:title + } + \fill-line { + \large \smaller \bold + \larger \fromproperty #'header:subtitle + } + \fill-line { + \smaller \bold + \fromproperty #'header:source + } + \fill-line { + \line { \fromproperty #'header:meter } + \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger } + } + } + } + } +} diff --git a/header_default.ily b/header_default.ily new file mode 100755 index 0000000..e14d07b --- /dev/null +++ b/header_default.ily @@ -0,0 +1,39 @@ +%{ + Header formatting for tunes. Customize to get your name in the tag line. +%} + +\version "2.16.0" + +today = #(strftime "%B %e, %Y" (localtime (current-time))) + +\paper { + tagline = \markup { + \line { + "Cpl ET de Boone, Seaforths of Holland," + \concat { "(rev. " \today ")" } + } + } + scoreTitleMarkup = \markup { + \override #'(baseline-skip . 3) + \column { + \fill-line { + \column { + \large \bold \fromproperty #'header:title + \bold \fromproperty #'header:subtitle + } + \fromproperty #'header:meter + \column \right-align { + \fromproperty #'header:instrument + \line { + \fromproperty #'header:composer + $(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger)) + (markup " ")) + \italic \fromproperty #'header:arranger } + } + } + $(if (not (ly:get-option 'without-comment)) + (markup #:justify-field 'header:comment) + (markup)) + } + } +} diff --git a/hornpipes/itchy_fingers/config.ily b/hornpipes/itchy_fingers/config.ily new file mode 100755 index 0000000..33db2fe --- /dev/null +++ b/hornpipes/itchy_fingers/config.ily @@ -0,0 +1,15 @@ +\version "2.19.0" +%% Globals +global = { + \time 2/4 + \eighthBeaming + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Itchy Fingers" +meter = "Hornpipe" \ No newline at end of file diff --git a/hornpipes/itchy_fingers/notes.side.ily b/hornpipes/itchy_fingers/notes.side.ily new file mode 100755 index 0000000..3babef6 --- /dev/null +++ b/hornpipes/itchy_fingers/notes.side.ily @@ -0,0 +1,35 @@ +% 2/4 Itchy Fingers +% Side +\version "2.18.2" +composerSide = "Dean Hall, 1995" +snareAA = \drummode { + \flamd d16-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> d8:32( | + + g16)-> d32 g32 d16 g16-> d32 g32 d32 g32 d16-> d16:64( | + d16) g16-> d32 g d g d4:32( | +} +snareAB = \drummode { + \flamd d16)-> g d \flamg g-> d16 g \flamd d-> g | + d16 \flamg g-> d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> +} + +snareBA = \drummode { + d16 g16 | + d32-> g d g d g d g d16-> g d d | + g32-> d g d g-> d g d g16-> d g g | + + d32-> g d g d g d-> g d g d g d8-> | + d16-> d16:64( d16) g16 d4:32(-> | +} + +snareBBA = \drummode { + d8)-> \flamg g8-> \flamd d16-> g d \flamg g-> | + d16 g16-> d32 g d g d8-> \flamd d16-> g16 | + + d32 g d g d16-> g16 d16 d16:64( d16) g16 | + d8:32(-> g8:32)(-> d8)-> +} \ No newline at end of file diff --git a/hornpipes/itchy_fingers/side.ly b/hornpipes/itchy_fingers/side.ly new file mode 100755 index 0000000..e71eb1f --- /dev/null +++ b/hornpipes/itchy_fingers/side.ly @@ -0,0 +1,27 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { \repeat volta 2 {\line \break} + \repeat volta 2 {\part \halfline \break} + \alternative { {\halfline \break} {\halfline \break } } + } + { \snareAA \snareAB s8 + \snareBA + \snareBBA s8 + \snareAB s8 + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/config.ily b/jigs/seaforth_sticks/config.ily new file mode 100755 index 0000000..74af3c4 --- /dev/null +++ b/jigs/seaforth_sticks/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 6/8 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s2. | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Seaforth Sticks" +meter = "Jig" \ No newline at end of file diff --git a/jigs/seaforth_sticks/drums.ly b/jigs/seaforth_sticks/drums.ly new file mode 100755 index 0000000..a0ee950 --- /dev/null +++ b/jigs/seaforth_sticks/drums.ly @@ -0,0 +1,65 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + }%Format + { + \snareA + \snareB + \snareC + \snareD + \snareE + \snareF + \snareG + \snareH + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.bass.ily b/jigs/seaforth_sticks/notes.bass.ily new file mode 100755 index 0000000..ad900bf --- /dev/null +++ b/jigs/seaforth_sticks/notes.bass.ily @@ -0,0 +1,6 @@ +% 6/8 Seaforth Sticks +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.side.ily b/jigs/seaforth_sticks/notes.side.ily new file mode 100755 index 0000000..6d87e50 --- /dev/null +++ b/jigs/seaforth_sticks/notes.side.ily @@ -0,0 +1,123 @@ +% 6/8 Seaforth Sticks +% Side +\version "2.18.2" +composerSide = "" +snareA = \drummode { + r8 | + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 \flamg g4 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%B +snareB = \drummode { + g8 | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ g8 | + + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%C +snareC = \drummode { + d8:32( | + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8 d8 \flamg g8-^ | + d8 g8 \flamg g8-^ \flamg g4-^ d8:32( | + + d4) \flamd d8 g8 d8 g8-^| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%D +snareD = \drummode { + g8 | + d4.:32(-> d8) g8 g8| + d4.:32(-> d8) g8 g8| + + \flamd d8 g8 d8 \flamg g4 g8-^ | + d8 g8 \flamg g8-^ \flamg g4 g8 | + + d4.:32(-> d8) g8 g8| + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> g8 d8 g8 | + d4.:32( d4.) +} +%E +snareE = \drummode { + r8 | + \flamd d8 g8 d8 \backstick d4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d4.:32(-> d8) g8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + d4.:32( d4.) +} +%F +snareF = \drummode { + g8 | + d4.:32(-> d4.:32)(-> | + d16) g d g d8-> g8^"Y" d8 g8 | + + \flamd d8-^ g8 \flamd d8-^ g8^"Y" d8 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | + + d4.:32(-> d8) g8 g8 | + d16 g d g d8-> g8 d8 g8 | + + d16 g d g d8-> db4 g8 | + d4.:32( d4.) +} +%G +snareG = \drummode { + d8:32( | + d4)-^ \backstick d8 g8 d8 g8-^| + d16 g d g d8 g8 d8 g8 | + + \flamd d8 g8 d8 \backstick d4 g8 | + \flamd d8 g8 g8 \backstick d4 d8:32( | + + d4)-> \backstick d8 g8 d8 g8| + d16 g d g d8-> g8 d8 g8 | + + \flamd d8 g d8-> \backstick d4 g8 | + d4.:32( d4.) +} +%H +snareH = \drummode { + g8 | + \flamd d8 d16 g16 d8 \repeat unfold 3 { \crossstick sn8^"X" }| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flamd d8 g8 d8 \backstick d4 g8 | + \flamd d8 g8 d8 \backstick d4 g8 | + + \flamd d8 d16 g16 d8 \repeat unfold 3 { sn8^"X" }| + \flamd d8 g8 d8 g8^"Y" d8 g8| + + \flam d8 g8 d8 \backstick d4 g8 | + d4.:32( d4.) +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/notes.tenor.ily b/jigs/seaforth_sticks/notes.tenor.ily new file mode 100755 index 0000000..27cfe63 --- /dev/null +++ b/jigs/seaforth_sticks/notes.tenor.ily @@ -0,0 +1,6 @@ +% 6/8 Seaforth Sticks +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/side.ly b/jigs/seaforth_sticks/side.ly new file mode 100755 index 0000000..c91b947 --- /dev/null +++ b/jigs/seaforth_sticks/side.ly @@ -0,0 +1,38 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + } + { + \snareA + \snareB + \snareC + \snareD + \snareE + \snareF + \snareG + \snareH + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly new file mode 100755 index 0000000..e12bc43 --- /dev/null +++ b/jigs/seaforth_sticks/tenor.ly @@ -0,0 +1,29 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 8 { + \mark \default + \repeat volta 2 { + \part + \line + } + \break + } + } + {} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly index ee38e94..f905bcd 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -27,8 +27,8 @@ #(ly:set-option 'point-and-click #f) #(ly:set-option 'relative-includes #t) -\include "lilydrum/layout_tweaks.ily" -\include "lilydrum/musical_functions.ily" -\include "lilydrum/embellishments.ily" -\include "lilydrum/flourishing.ily" -\include "lilydrum/special_sticking.ily" +\include ".lilydrum/layout_tweaks.ily" +\include ".lilydrum/musical_functions.ily" +\include ".lilydrum/embellishments.ily" +\include ".lilydrum/flourishing.ily" +\include ".lilydrum/special_sticking.ily" diff --git a/makedrum b/makedrum index 549a7e9..7458a22 100755 --- a/makedrum +++ b/makedrum @@ -34,9 +34,6 @@ class MakeDrum: parser.add_argument('-c', '--pipefile', dest='lilypipe', default='bagpipe.ly', help='Use the specified file for pipes') - parser.add_argument('-i', '--include', - dest='includes', nargs='*', default=[],action='append', - help='Include the specified file for compiling') parser.add_argument('-p', '--paper-size', dest='papersize', default='a4', @@ -47,6 +44,9 @@ class MakeDrum: parser.add_argument('-s', '--staff-size', dest='staffsize', default='20', help='Staff size. Default: 16pt.') + parser.add_argument('-f', '--format', + dest='format', default=None, + help='Use header format file "header_{format}". Default: "header_default"') parser.add_argument('-w', '--view-spacing', action='store_true', dest='view_spacing', default=False, help='Turn on "Paper.annotatespacing".') @@ -92,14 +92,11 @@ class MakeDrum: if self.args.list_file != '': self.args.music_file.append(open(self.args.list_file, 'r').readlines()) close(self.args.list_file) - # Check for files if not self.args.music_file: parser.print_usage() return - # Check for files to include - self.args.includes = [el for elements in self.args.includes for el in elements] # Clean up of files self.remove_tmp_dir = self.args.clean @@ -125,7 +122,15 @@ class MakeDrum: os.chdir(self.RUN_DIR) def processit(self, tmp_dir, file, gen_out, compile): - tmp_file = self.maketemplate(tmp_dir, file) + if self.args.format is None: + if file.endswith(".book"): + header_format = "header_book" + else: + header_format = "header_default" + else: + header_format = "header_" + self.args.format + + tmp_file = self.maketemplate(tmp_dir, file, header_format) if gen_out is not None and gen_out != tmp_dir: new_tmp_file = os.path.basename(tmp_file).replace(self.TMP_PREFIX, ''); @@ -171,7 +176,7 @@ class MakeDrum: os.remove(logfile) os.remove(tmp_file) - def maketemplate(self, tmp_dir, file): + def maketemplate(self, tmp_dir, file, header_format): lily_includes = '' include_drum_file = False include_pipe_file = False @@ -179,21 +184,17 @@ class MakeDrum: for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: if ext in file: include_drum_file = True - break - for ext in ['full', 'pipes']: if ext in file: include_pipe_file = True - break - if include_drum_file: - self.args.includes.insert(0,self.args.lilydrum) - + lily_includes = lily_includes + u""" +\\include \""""+self.args.lilydrum+"""\" +""" if include_pipe_file: - self.args.includes.insert(0, self.args.lilypipe) - - for f in self.args.includes: - lily_includes = lily_includes + "\n\\include \"{}\"".format(f) + lily_includes = lily_includes + u""" +\\include \""""+self.args.lilypipe+"""\" +""" # set up a tmp file with template and file combined tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-')) @@ -209,17 +210,11 @@ class MakeDrum: #(ly:set-option 'point-and-click #f) """+ lily_includes +""" +\\include \""""+os.path.join(os.path.abspath(self.MASTER_DIR), header_format.strip(".ily")+""".ily""")+"""\" #(set-global-staff-size """+self.args.staffsize+""") #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") -%\layout { -% \context { -% \Score { -% \override NonMusicalPaperColumn #'line-break-permission = ##f -% } -% } -%} % The tune to generate. """) diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly new file mode 100755 index 0000000..f465711 --- /dev/null +++ b/other/band_of_brothers.snare.ly @@ -0,0 +1,128 @@ +\version "2.18.2" + +#(set-default-paper-size "a4" 'landscape) +#(set-global-staff-size 19) +\layout { + indent = 0 + \set Score.markFormatter = #format-mark-box-alphabet + \context { + \DrumStaff + % one line per staff + \override StaffSymbol.line-positions = #'(0) + \numericTimeSignature + } +} +\score { + \new DrumStaff = "staff_snare" { + \drummode { + \compressMMRests { + \tempo 2. = 32 + \time 3/4 + \override MultiMeasureRest.expand-limit = #3 + R2.*4 + } + \compressMMRests { + \bar "||" + \mark \default + R2.*35 + } + \bar "||" + \tempo 4 = 108 + \mark \default + \time 4/4 + sn4 \f \tuplet 3/2 {r8 sn8 sn8 } r4 sn4 | + \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | + \grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 + + | + \time 2/4 + + sn2:16( + + | + \time 4/4 + + \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8} \tuplet 3/2 { sn8 sn8 sn8} + + \bar "||" + \mark \default + \repeat percent 7{ + \grace sn8 sn4 \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | + \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 | + } + + \grace sn16 \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 sn2:32( | + \tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4 | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 \grace {sn16 sn16} sn4 \grace {sn16 sn16} sn4 | + + \bar "||" + \mark \default + \repeat percent 10 { + \grace {sn16} sn4 \mf \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } sn4 \grace { sn16 sn16 sn16 sn16 } \tuplet 3/2 { sn8 sn8 sn8} | + } + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 \mf\< sn8 } + \tuplet 3/2 { r8 sn8 sn8 } + \tuplet 3/2 { sn4 sn8 } + \tuplet 3/2 { sn8 sn8 sn8 \! } + | + + \grace { sn16 sn sn sn} \tuplet 3/2 { sn4 \f sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8} | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | + + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn} | + sn1:32( + + \bar "||" + \mark \default + sn8) \f r8 r4 r2 | + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \grace {sn16} sn8 r8 r4 r2 + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \bar "||" + \mark \default + + \repeat percent 3 { + \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + } + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8 } \grace sn16 \tuplet 3/2 { sn8 sn sn} | + \repeat percent 3 { + \tuplet 3/2 {sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + } + \tuplet 3/2 {sn4 \< sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \tuplet 3/2 { sn4 \ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } + sn8 r8 r4 r2 | + + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn sn } + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn16 sn16 sn8 } \tuplet 3/2 { sn8 sn sn } | + sn8 r8 r4 \tuplet 3/2 { sn4 sn sn } | + \tuplet 3/2 { sn4 \fp\< sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + + \bar "||" + \tuplet 3/2 { sn4\ff sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + \tuplet 3/2 { sn4 sn8} \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8. sn16 sn8 } \tuplet 3/2 { sn8 sn sn} | + sn8 r8 r4 sn4:32( sn4:32)( | + \tuplet 3/2 { sn8) sn8 r8 } \tuplet 3/2 { r8 sn8 sn8 } sn8 r8 r4 + } + } + \header { + title = "Band of Brothers" + subtitle = "for the Edinburgh Military Tattoo 2005" + arranger = "Michael Kamen, arr. Richard Barriball" + instrument = "Snare Drum" + meter = "" + } + +} + + diff --git a/standards/24_standards.side.ly b/standards/24_standards.side.ly new file mode 100755 index 0000000..52cf461 --- /dev/null +++ b/standards/24_standards.side.ly @@ -0,0 +1,73 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \eighthBeaming + \time 2/4 + + \drummode { + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + % LINE 4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + }% End of drums % + } + \header { + title = "2/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards1.side.ly b/standards/34_standards1.side.ly new file mode 100755 index 0000000..2a6fed6 --- /dev/null +++ b/standards/34_standards1.side.ly @@ -0,0 +1,64 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \eighthBeaming + \time 3/4 + + \drummode { + \repeat volta 2{ + \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) d8:32( d8:32)( d8) | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) d8:32( g16.) d32-> g16. g32 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 d16 \flamg g8 d16 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamd d8 d8:32( d8) | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g16.) g32 \flamd d16. g32 d16. \flamg g32 d16. g32 + \flamd d4 d4:32( d4) + } + }% End of drums % + } + \header { + title = "3/4 Standards\nSetting 1" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards2.side.ly b/standards/34_standards2.side.ly new file mode 100755 index 0000000..5d49f3a --- /dev/null +++ b/standards/34_standards2.side.ly @@ -0,0 +1,61 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \eighthBeaming + \time 3/4 + + \drummode { + \repeat volta 2{ + d4:32(-> d8) d8:32(-> d4) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + d4:32(-> d8) d8:32(-> d4) | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + d4:32( g8) d8:32( g8) g8 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + d4:32( g8) d8:32( g8) g8 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16 g16 d16 \flamg g16 d16 g16 \flamd d16 g16 d16 \flamg g16 d16 g16 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} \flamd d8 \tuplet 3/2 {d16 g16 d16} | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d4 d4:32( d4) + } + }% End of drums % + } + + \header { + title = "3/4 Standards\n Setting 2" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/34_standards3.side.ly b/standards/34_standards3.side.ly new file mode 100755 index 0000000..f3f2e1b --- /dev/null +++ b/standards/34_standards3.side.ly @@ -0,0 +1,65 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \eighthBeaming + \time 3/4 + + \drummode { + \repeat volta 2{ + \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | + d8) d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( d8:32)(-> g8:32)(-> g8:32)( d8:32)(-> | + d4) d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g16.) d32:128( d16.) g32 g8:32( g8) | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamg g8 d16 d d d | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamg g8 d16 d d d + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d8:32( g8) \flamg g8 r16 r16 d16 d | + \flamd d4 d4:32( d4) + } + + \break + \repeat volta 2{ + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 \flamd d16. g32 d16. g32 | + \flamd d4 d4:32( d4) + } + \break + \repeat volta 2{ + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d8 d8:32( \tuplet 3/2 { g16) d16 g16 } \flamd d16. g32 \tuplet 3/2 { d16 g16 d16 } \flamg g8 | + \flamd d8 d32 g d g d8 d32 g d g d16. g32-> d16. d32 | + \flamd d4 d4:32( d4) + } + }% End of drums % + } + + \header { + title = "3/4 Standards\n Setting 3" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/44_standards.side.ly b/standards/44_standards.side.ly new file mode 100755 index 0000000..6f779cd --- /dev/null +++ b/standards/44_standards.side.ly @@ -0,0 +1,93 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \time 2/4 + + \drummode { + \repeat volta 2{ + \partial 8 r8 | + R1 | + r4 r8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 | + d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + R1 | + r4 r8 d8:32( | + g8) \flamd d16. g32 d16. \flamg g32 d16. g32 | + \flamd d8 d8:32( g8) + } + }% End of drums % + } + + \header { + title = "2/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} +\score { + \new PipeBandDrumStaff { + \eighthBeaming + \time 4/4 + \drummode{ + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8 \tuplet 3/2 { d16 g d } \flamg g8 d8:32( g16.) d32-> g16. g32 \flamd d8 d8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) \flamg g8 d16. g32-> d16. d32 \flamg g8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d16. g32 d16. d32 \flamg g16. d32 g16. g32 d16. \flamg g32 d16. d32 \flamg g8 d8 | + \flamd d4 d4:32( d4) r8 + } + \break + % LINE 4 + \repeat volta 2{ + \partial 8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \flamd d8. g16 \flamd d8 d8:32( d16.) g32-> d16. d32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + d4:32( d8) d8:32( d8:32)( d16.) g32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + \break + \repeat volta 2{ + \partial 8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 d8:32( | + \tuplet 3/2 { g16) d g } \flamd d16. g32 \tuplet 3/2 { d16 g d } \flamg g16. g32 d16. g32 \tuplet 3/2 { d16 g d } \flamg g8 d16. g32 | + \tuplet 3/2 { d16 g d } \flamg g8 \tuplet 3/2 { d16 g d } g8 d16. g32-> d16. d32 \flamd d8 g8 | + \flamd d4 d4:32( d4) r8 + } + }% End of drums % + } + + \header { + title = "4/4 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly new file mode 100755 index 0000000..b08a5ab --- /dev/null +++ b/standards/68_standards.side.ly @@ -0,0 +1,90 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\score { + \new PipeBandDrumStaff { + \time 6/8 + + \drummode { + \repeat volta 2{ + \partial 8 g8 | + \flamd d4 d8:32( g4) d8:32( | + g8.) g16 d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + \flamd d4 d8:32( g4) d8:32( | + g8.) g16 d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d8:32( d8) g8 d8:32( d8) g8 | + \flamd d8 d8:32( d8) d8:32( d8) g8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d8:32( d8) g8 d8:32( d8) g8 | + \flamd d8 d8:32( d8) d8:32( d8) g8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d4.:32(\< d4.:32)( | + d8.)\! g16 d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d4.:32(\< d4.:32)( | + d8.)\! g16 d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 d8:32( | + g8.) g16 \flamd d8 d8. d16 \flamg g8 | + d8. g16 \flamd d8 \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8:32( | + g8.) g16 \flamd d8 d8. d16 \flamg g8 | + d8. g16 \flamd d8 \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 d8:32( | + \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | + \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 d8:32( | + \tuplet 3/2 { g8) d g } \flamd d8 \tuplet 3/2 { g8 d g } \flamd d8 | + \tuplet 3/2 { d8 g d-> } \tuplet 3/2 { g8 d g } \tuplet 3/2 { \flamd d8 g8. d16 } | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + \break + \repeat volta 2{ + \partial 8 g8 | + d4.:32(\< d4.:32)( | + d16)\!\< g d g d8\! \flamd d8. g16 d8 | + \flamd d8. g16 d8 d4.:32( | + d8.) g16 d8 \flamd d4 g8 | + d4.:32(\< d4.:32)( | + d16)\!\< g d g d8\! \flamd d8. g16 d8 | + \flamd d8. d16:64( d8) d4.:32( | + d8.) g16 d8 \flamd d4 + } + }% End of drums % + } + + \header { + title = "6/8 Standards" + meter = "Quick March" + composer = "" + instrument = "Side" + } +} \ No newline at end of file diff --git a/standards/standards.bass.ly b/standards/standards.bass.ly new file mode 100755 index 0000000..65d30de --- /dev/null +++ b/standards/standards.bass.ly @@ -0,0 +1,64 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\header { + title = "Standards" + instrument = "Bass" + } + +\score { + \new PipeBandDrumStaff { + \time 2/4 + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4-> g4 } + } + } + } + \header { + title = "2/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 3/4 + + \drummode { + \repeat volta 3 { + \repeat unfold 8 { d4-> g4 g4 } + } + } + } + \header { + title = "3/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 4/4 + + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4\v g4 d4-> g4} + } + } + } + \header { + title = "4/4 Standard" + } +} +\score { + \new PipeBandDrumStaff { + \time 6/8 + + \drummode { + \repeat volta 2 { + \repeat unfold 8 { d4. g4. } + } + } + } + \header { + title = "6/8 Standard" + } +} \ No newline at end of file diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly new file mode 100755 index 0000000..41cdf81 --- /dev/null +++ b/standards/standards.tenor.ly @@ -0,0 +1,132 @@ +\version "2.18.2" + +\include "lilydrum.ly" + +\header { + instrument = "Tenor" + title = "Standards" +} + +\score { + \new PipeBandDrumStaff { + \time 2/4 + + \drummode { + \repeat volta 2 { + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d8-> g d g | + d4-> r | + \bar "||" + \break + \flourish { + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 g | + d4 d | + g4 d | + } + } + } + } + + \header { + title = "2/4 Standards" + } +} + +\score { + \new PipeBandDrumStaff { + \time 3/4 + + \drummode { + \repeat volta 2 { + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + d8.-> g16 d8 g r g | + d4-> d8 g d4 | + \bar "||" + \break + \flourish{ + d4-> d d | + g4-> g g | + d4-> d g | + g4-> d g | + } + } + } + } + + \header { + title = "3/4 Standards" + } +} + +\score { + \new PipeBandDrumStaff { + \time 4/4 + + \drummode { + \repeat volta 2 { + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d8-^ g d g d-> g d g | + d4-^ g d r | + \bar "||" + \break + \flourish { + d4 d g g | + d4 d g g | + d4 d g g | + } + \flourish d4 \flourish g d^\splitTheFeather r | + } + } + } + + \header { + title = "4/4 Standards" + } +} + +\score { + \new PipeBandDrumStaff { + \time 6/8 + + \drummode { + \repeat volta 2 { + \flourish d4. \flourish g | + d^\splitTheFeather r | + d g | + d8 r8 g8 d4. | + \flourish d4. \flourish g | + d^\splitTheFeather r | + d g | + d8 r8 g8 d4. | + \bar "||" + \break + \flourish { + d4. d | + g g | + d d | + g g | + d d | + g g | + d g | + } + d^\splitTheFeather r | + } + } + } + + \header { + title = "6/8 Standards" + } +} diff --git a/strathspeys/aa_camerons/config.ily b/strathspeys/aa_camerons/config.ily new file mode 100755 index 0000000..2f9ab87 --- /dev/null +++ b/strathspeys/aa_camerons/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 2 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "A. A. Cameron's Strathspey" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/aa_camerons/notes.side.ily b/strathspeys/aa_camerons/notes.side.ily new file mode 100755 index 0000000..d5cf8fd --- /dev/null +++ b/strathspeys/aa_camerons/notes.side.ily @@ -0,0 +1,30 @@ +% 4/4 A. A. Cameron's Strathspey +% Side +\version "2.18.2" +composerSide = "G. Clark, 1988" +snareAA = \drummode { + \flamd d8.-> \tuplet 3/2 { g32 d32 d32 } g8.[ \dragd d16] \tuplet 3/2 { d16 g d g d8 } g4:32(-> | + d8.) g16 \tuplet 3/2 { d8:32( d8) g8-> } \tuplet 3/2 { d8[ g8 \dragd d8] } \tuplet 3/2 { d16 g d g d8 } | +} +snareABA = \drummode { + g8.-> \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d32 g32 g32 } d16 g8 \flamd d8. g16 | + \flamd \tuplet 3/2 { d8 g8 \flamg g8 } \tuplet 3/2 { d8 \flamd d8 g8-> } \tuplet 3/2 { d8 g8 d16-> g16 } \tuplet 3/2 { d16 g16 d8 g8 } +} +snareABB = \drummode { + g8.-> g16 \tuplet 3/2 { d16[-> g d g \dragd d8] } \tuplet 3/2 { d16 g d-> g d g } d8. g16 | + \flamd d8. \tuplet 3/2 { g32 d32 d32 } \tuplet 3/2 { g8 d8 \flamg g8 } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { g8 d g } +} + +% Part 2 +snareBA = \drummode { + d4:32(-> \tuplet 3/2 { d16) g16 d16 } \flamg g8 \tuplet 3/2 { d8 g d } d4:32( | + d8.) \flamg g16 \tuplet 3/2 { d8 g d } \tuplet 3/2 { \flamd d16 g d } g8-> \tuplet 3/2 { d8 g d } | +} +snareBBA = \drummode { + \flamd d8. g16 \tuplet 3/2 { d16-> g d d g-> d } \tuplet 3/2 { g16 g d8-> g } d8.-> \tuplet 3/2 { g32 d d } | + g8. d16 \flamg \tuplet 3/2 { g8 d \flamg g } \tuplet 3/2 { d8 g d16-> g } \tuplet 3/2 { d16 g d8 g } +} +snareBBB = \drummode { + \flamd d8. g16 \tuplet 3/2 { d16 g d g d8-> } \tuplet 3/2 { g8 d16 g16 d16 g16 } d4:32(-> | + d8.) g16 \flamd \tuplet 3/2 { d8 g \flamg g } \tuplet 3/2 { d16 g d g d8 } \tuplet 3/2 { d8 g d } +} \ No newline at end of file diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly new file mode 100755 index 0000000..c23854f --- /dev/null +++ b/strathspeys/aa_camerons/side.ly @@ -0,0 +1,39 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { + \repeat unfold 2 { + \repeat volta 2 { \halfline } + \alternative { + {\halfline} + {\halfline } + } + \break + } + \bar "|." + } + { + \snareAA + \snareABA + \snareABB + + + \snareBA + \snareBBA + \snareBBB + } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly new file mode 100755 index 0000000..649db5e --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\bassA \bassBA \bassBB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/config.ily b/strathspeys/lady_mackenzie_of_fairburn/config.ily new file mode 100755 index 0000000..685b8f8 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/config.ily @@ -0,0 +1,13 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 16 s16 } +line = { \repeat unfold 4 { s1 | } } + +%% Headers +title = "Lady MacKenzie of Fairburn" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly new file mode 100755 index 0000000..fe6eee2 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/drums.ly @@ -0,0 +1,51 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { \repeat volta 2 {\line } \break \part \line \break \line \bar "|."} + { \snareA s16 \snareBA \snareBB } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassA + s16 \bassBA \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorA + s16 \tenorBA \tenorBB + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly new file mode 100755 index 0000000..ffcdbce --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly @@ -0,0 +1,64 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" +\include "notes.pipes.ily" + +\score { + \new StaffGroup << + \new Staff { + \global + \bagpipeKey + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + << + { \repeat volta 2 { \part \line } + \break \part \line \bar "||" + \break \line \bar "|." + } + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + s16 \snareA + s16 \snareBA \snareBB + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + s16 \bassA + s16 \bassBA \bassBB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + s16 \tenorA + s16 \tenorBA \tenorBB + } + >> + \header { + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily new file mode 100755 index 0000000..635f277 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.bass.ily @@ -0,0 +1,25 @@ +% 4/4 Lady MacKenzie of Fairburn +% Bass +\version "2.18.2" +composerBass = "E.T. de Boone, v0.8, 2015" +bassA = \drummode { + bd4 bd4-> r4 bd4 + | + bd4-> r4 bd4 r4 + | + bd4-> bd4 r4 bd4 + | + bd4 r4 bd4-> bd4 +} +bassBA = \drummode { + bd4 r4 bd4 bd | + bd4 r4 bd4 r4 | + bd4 bd4 bd4 bd | + bd8 bd8 r8 bd8 r8 bd8 bd4 | +} +bassBB = \drummode { + bd4 r4 bd4 bd | + bd4 r4 bd4 r4 | + bd4 bd4 bd8 bd8 r4 | + bd8 bd8 r8 bd8 r8 bd8 bd4 | +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily new file mode 100755 index 0000000..27f092d --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily @@ -0,0 +1,70 @@ +% 4/4 Lady MacKenzie of Fairburn +% Pipes +\version "2.18.2" +composerPipes = "J. Wark, arr. R. Stanley" +pipesA = { + d16 | + \dblc c8. e16 + \dblA A4 + g16 f16 e8 + \dblA A4 + | + \hdblc c8. e16 + \dblA A8. d16 + \dblc c8. b16 + \grg a8. d16 + | + \dblc c8. e16 + \dblA A4 + g16 f e8 + \dblg g4 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg a8. +} +pipesBA = { + d16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble e8. d16 + \dblc c8. b16 + \grg a8. A16 + | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} +pipesBB = { + A16 | + a8. \grd c16 + \dble e8. a16 + \grg f8. a16 + \dble e4 + | + \grg a8. \grd c16 + \dble d8. d16 + \dblc c8. b16 + \grg a16 A8. + | + a8. \grd c16 + \grg e16 A8. + \hdblf g16 d8. + \dble e8. c16 + | + \thrwd d8. e16 + \dblg g8. d16 + \dblb b8. a16 + \grg G8. +} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily new file mode 100755 index 0000000..95e0700 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily @@ -0,0 +1,69 @@ +% 4/4 Lady MacKenzie of Fairburn +% Side +\version "2.18.2" +composerSide = "E.T. de Boone, v0.9, 2015" +snareA = \drummode { + \flam d8. g16 + d8.:32( g16) + \flamd \triplet { d8 \dr \< g16 g d8 } + \flam g8.-> \! \fr \parenthesize g16 + | + \triplet { d16 g d g d8 } + \triplet { g8-> d g-> } + d8.:32(-> \dr g16:64)(-> + d4) + | + \triplet { d8 d g } + \flam d8. \fr g16 -> + \triplet { d16\< g d g d8 } + g16\! d8. + | + d8.[:32(\< \dr g16]:32)(-> \> + d8.[:32)( g16]:32)(-> \< + d8.[:32)( g16]:32)(-> + d8.) \! \fr +} +snareBA = \drummode{ + g16 | + \triplet {d8 g \flam d } + \triplet {g d \flam g } + \triplet {d8 g \flam d \dr } + \flam g8. g16 + | + \flam d16. d32 \flam g8 \fr + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 \dr + | + \flam d8. \fr g16 + d4:32( + \triplet { d16) g d g d8} + g8. g16 + | + d8.[:32(\< \dr g16]:32)(-> \> + d8.[:32)( g16]:32)(-> \< + d8.[:32)( g16]:32)(-> + d8.) \! \fr +} +snareBB = \drummode{ + g16 | + \triplet {d8 g \flam d} + \triplet {g d \flam g} + \triplet {d8 g \flam d} + \flam g8. g16 + | + \flam d16. d32 \flam g8 + d8.:32( g16:32)(-> + d16.) g32 d8 + \flam d8. g16 + | + \drag d16 d8 g16 + d8.:32( g16) + \flamd \triplet { d8 \< g16 g d8 } + \flam g4-> \! + | + d8.[:32( g16]:32)(-> + d8.:32)( g16]:32)(-> + d8.[:32)( g16]:32)(-> + d8.) +} diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily new file mode 100755 index 0000000..6e93fb8 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily @@ -0,0 +1,56 @@ +% 4/4 Lady MacKenzie of Fairburn +% Tenor +\version "2.18.2" +composerTenor = "E.T. de Boone, v0.8, 2015" +tenorA = \drummode { + d8.[ g16] d4^\splitTheFeather r4 << d4 g4 >> + | + \flourish { d4 g4 d4 g4 } + | + d4 r16 g d-> r r8. g16 d4 + | + d4 g4 d4 r4 + | +} +tenorBA = \drummode { + \triplet { d8 \< g d } + \triplet { g8 d g } + \triplet { d8 g d } + g8. \! g16 + | + d8. g16-> + r8. g16 + d8. g16-> + r4 + | + d8. g16 + d4 + g8. d16 + g4 + | + d8 \flourish g8 + r8 \flourish d8 + r8 g8 + d4 +} +tenorBB = \drummode { + \triplet { d8 \< g d } + \triplet { g8 d g } + \triplet { d8 g d } + g8. \! g16 + | + d8.^"begin scoop" \dr g16-> + r8. g16 + d8.^"end scoop" \fr g16-> + r4 + | + d16 g8. + \flourish d4 + g8. d16 + \flourish g4 + | + \triplet { d8 g d } + g4 + d8. g16 + d4 +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly new file mode 100755 index 0000000..711e24c --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly @@ -0,0 +1,21 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" + +\score { + \new Staff { + \global + \bagpipeKey + << + {\repeat volta 2 { \part \line } \break \part \line \break \line \bar "|."} + {\pipesA s16 \pipesBA \pipesBB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly new file mode 100755 index 0000000..e82ac70 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \bar "||" \break \line \bar "|."} + {\snareA s16 \snareBA \snareBB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly new file mode 100755 index 0000000..896c011 --- /dev/null +++ b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \line \break \line \bar "|."} + {\tenorA \tenorBA \tenorBB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly new file mode 100755 index 0000000..5377e71 --- /dev/null +++ b/strathspeys/molly_connell/bass.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.bass.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + \repeat volta 2 { \line \break \line \break } + {\bassAA \bassAB} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentBass + composer = \composerBass + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/config.ily b/strathspeys/molly_connell/config.ily new file mode 100755 index 0000000..7c7ab19 --- /dev/null +++ b/strathspeys/molly_connell/config.ily @@ -0,0 +1,13 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + \tempo 4 = 120 + } +%% Format +part = { \partial 8 s8 } +line = { \repeat unfold 4 { s1 } } + +%% Headers +title = "Molly Connell" +meter = "Strathspey" \ No newline at end of file diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly new file mode 100755 index 0000000..c46ce33 --- /dev/null +++ b/strathspeys/molly_connell/drums.ly @@ -0,0 +1,78 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.v1.1.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + \global + << + { + \line \break + \line \break + \bar "|." + + \part \line \break + \part \line \break + \bar "|." + }%End of Format + { + \set Score.proportionalNotationDuration = #(ly:make-moment 1/8) + \snareA + s8 + \snareA + s8 + + \snareBA + \snareBB + } + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + \bassAA + \bassAB + + s8 + \bassAA + s8 + \bassAB + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + \tenorA + \tenorA + + s8 + \tenorBA + s8 + \tenorBB + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.bass.ily b/strathspeys/molly_connell/notes.bass.ily new file mode 100755 index 0000000..a1af8bb --- /dev/null +++ b/strathspeys/molly_connell/notes.bass.ily @@ -0,0 +1,16 @@ +% 4/4 Molly Connell +% Bass +\version "2.18.2" +composerBass = "W.H. de Boone / E.T. de Boone, 2014" +bassAA = \drummode { + d4-> g4-> d4 g4 | + d4 g4 d4 g4 | + d4-> g4 d4 g4 | + d4-> g4 d8.-> g16 d4 | + } +bassAB = \drummode { + d4-> g4-> d4 g4 | + r8 d8 r8 g8 r8 d8 r8 g8 | + d4-> g4 d4 g4 | + d4-> g4 r8. g16 d4 | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily new file mode 100755 index 0000000..8a5ac64 --- /dev/null +++ b/strathspeys/molly_connell/notes.side.ily @@ -0,0 +1,28 @@ +% 4/4 Molly Connell +% Side +\version "2.18.2" +composerSide = "v1.0, 21-2-2014" +snareA = \drummode { + \flam d4 \flam g8.[ d16:64(] d8.[) \drag d16] d8.[ g16] | + d8.:64[( g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flam g8] } \flam d8.[ g16] | + + d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \flamd \triplet { d8 g d } \flam g8.[ \flam g16] \triplet { d16 g d g d8 } g8 +} + +snareBA = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flamd \triplet { d8[ g16 g16 d8] } g8.[ g16] \triplet { d8[ g16 g16 d8] } g8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} +snareBB = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flam d4 \flam g8.[ d16:64]( d8.[) \drag g16] d8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8| +} \ No newline at end of file diff --git a/strathspeys/molly_connell/notes.side.v1.1.ily b/strathspeys/molly_connell/notes.side.v1.1.ily new file mode 100755 index 0000000..ff78686 --- /dev/null +++ b/strathspeys/molly_connell/notes.side.v1.1.ily @@ -0,0 +1,28 @@ +% 4/4 Molly Connell +% Side +\version "2.18.2" +composerSide = "v1.1, 2015" +snareA = \drummode { + \flamddr d4 \flam g8.[\fr d16:64(] d8.[) \dragddr d16] d8.[ \fr g16] | + d8.:64[(-> g16]) \triplet { d16[ g d g d8]} \triplet { g8[ d8 \flamddr g8] } \flam d8.[ \fr g16] | + + d16:64[( d8.]) g8.[ \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \flamddr \triplet { d8 \fr g d } \flamddr g8.[ \flam g16] \triplet { d16 g d g d8 } g8 \fr +} + +snareBA = \drummode { + \partial 8 g8 \dr | + d4:32( d8.[) \drag d16] \fr \triplet { d16[ g d g d8] } g8.[ g16] \dr | + \drag d16[ d8.] \flam d8.[ \flam g16] \fr \triplet { d16[ g d g d8] } \triplet { g8[ d g] } | + + \flamddr \triplet { d8[ \fr g16 g16 d8] } g8.[ g16] \flamddr \triplet { d8[\fr g16 g16 d8] } g8.[ g16] | + \flamddr \triplet { d8[ \fr g d] } \flamddr g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 \fr | +} +snareBB = \drummode { + \partial 8 g8 | + d4:32( d8.[) \drag d16] \triplet { d16[ g d g d8] } g8.[ g16] | + \drag d16[ d8.] \flam d8.[ \flam g16] \triplet { d16[ g d g d8] } \triplet { g8[\> d g]\! } | + + \flam d4 \flam g8.[ d16:64]( d8.[) \drag d16] d8.[ g16] | + \flamd \triplet { d8[ g d] } \flam g8.[ \flam g16] \triplet { d16[ g d g d8] } g8 s8 | +} diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily new file mode 100755 index 0000000..49ada61 --- /dev/null +++ b/strathspeys/molly_connell/notes.tenor.ily @@ -0,0 +1,22 @@ +% 4/4 Molly Connell +% Tenor +\version "2.18.2" +composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, 2014" +tenorA = \drummode { + d4 g4 d8. g16 d4 + d4 g4 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBA = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + \flourish { d4 d4 g4 g4 } | + \flourish d4 \flourish g4 d4^\up g4^\up | +} +tenorBB = \drummode { + d4^\up g4^\up \flourish { d4 g4 } | + d4 \parenthesize d8. g16 r8. g16 d4 | + d4 g4 d8. g16 d4 | + \flourish d4 \flourish g4 d4^\up g4^\up | +} \ No newline at end of file diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly new file mode 100755 index 0000000..a1888ef --- /dev/null +++ b/strathspeys/molly_connell/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.v1.1.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 { \line } \break \part \line \break \bar "||" \part \line \bar "|." } + {\snareA s8 \snareBA \snareBB } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly new file mode 100755 index 0000000..7fc6955 --- /dev/null +++ b/strathspeys/molly_connell/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {\repeat volta 2 {\line} \break \line \bar "||" \break \line \bar "|." } + {\tenorA \tenorBA \tenorBB } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file diff --git a/template/config.ily b/template/config.ily new file mode 100755 index 0000000..61c2dff --- /dev/null +++ b/template/config.ily @@ -0,0 +1,14 @@ +\version "2.19.0" +%% Globals +global = { + \time 4/4 + } + +%% Format +part = { \partial 8 s8 } +halfline = { \repeat unfold 4 { s1 | } } +line = { \repeat unfold 2 { \halfline } } + +%% Headers +title = "Title" +meter = "Meter" \ No newline at end of file diff --git a/template/drums.ly b/template/drums.ly new file mode 100755 index 0000000..846ee3f --- /dev/null +++ b/template/drums.ly @@ -0,0 +1,47 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" + +\score { + \new StaffGroup << + \new PipeBandDrumStaff = "side" { + \global + \set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + << + { }%Format + { }%Music + >> + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup { + \column \right-align { + $(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=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/template/full.ly b/template/full.ly new file mode 100755 index 0000000..bbecdd8 --- /dev/null +++ b/template/full.ly @@ -0,0 +1,55 @@ +\version "2.19.0" + +\include "config.ily" +\include "notes.bass.ily" +\include "notes.tenor.ily" +\include "notes.side.ily" +\include "notes.pipes.ily" + +\score { + \new StaffGroup << + \new Staff { + \global + \bagpipeKey + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes } + << + {}%Format + {}%Pipes + >> + } + \new PipeBandDrumStaff = "side" { + \set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide} + \set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide} + + } + \new PipeBandDrumStaff = "bass" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass} + + } + \new PipeBandDrumStaff = "tenor" { + \set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor } + \set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor } + + } + >> + \header { + title = \title + meter = \meter + composer = \markup \large { + \column \right-align { + $(if (not (string=? "" composerPipes)) #{ \markup {\line { \composerPipes ":" }} #} ) + $(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=? "" composerPipes)) #{ \markup {\line { \instrumentPipes }}#} ) + $(if (not (string=? "" composerSide)) #{ \markup {\line { \instrumentSide }}#} ) + $(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} ) + $(if (not (string=? "" composerBass)) #{ \markup {\line { \instrumentBass }}#} ) + } + } + } +} \ No newline at end of file diff --git a/template/notes.bass.ily b/template/notes.bass.ily new file mode 100755 index 0000000..4f6752c --- /dev/null +++ b/template/notes.bass.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Bass +\version "2.18.2" +composerBass = "" +bassA = \drummode { +} \ No newline at end of file diff --git a/template/notes.pipes.ily b/template/notes.pipes.ily new file mode 100755 index 0000000..db072ff --- /dev/null +++ b/template/notes.pipes.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Pipes +\version "2.18.2" +composerPipes = "" +pipesA = { +} \ No newline at end of file diff --git a/template/notes.side.ily b/template/notes.side.ily new file mode 100755 index 0000000..dbaf43f --- /dev/null +++ b/template/notes.side.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Side +\version "2.18.2" +composerSide = "" +\snareA = \drummode { +} \ No newline at end of file diff --git a/template/notes.tenor.ily b/template/notes.tenor.ily new file mode 100755 index 0000000..f572169 --- /dev/null +++ b/template/notes.tenor.ily @@ -0,0 +1,6 @@ +% <<TimeSig>> <<Title>> +% Tenor +\version "2.18.2" +composerTenor = "" +tenorA = \drummode { +} \ No newline at end of file diff --git a/template/pipes.ly b/template/pipes.ly new file mode 100755 index 0000000..facb3fb --- /dev/null +++ b/template/pipes.ly @@ -0,0 +1,21 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.pipes.ily" + +\score { + \new Staff { + \global + \bagpipeKey + << + { } + { } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentPipes + composer = \composerPipes + } +} \ No newline at end of file diff --git a/template/side.ly b/template/side.ly new file mode 100755 index 0000000..ee8dae0 --- /dev/null +++ b/template/side.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.side.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + { } + { } + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentSide + composer = \composerSide + } +} \ No newline at end of file diff --git a/template/tenor.ly b/template/tenor.ly new file mode 100755 index 0000000..a96bc97 --- /dev/null +++ b/template/tenor.ly @@ -0,0 +1,20 @@ +\version "2.18.2" + +\include "config.ily" +\include "notes.tenor.ily" + +\score { + \new PipeBandDrumStaff { + \global + << + {} + {} + >> + } + \header { + title = \title + meter = \meter + instrument = \instrumentTenor + composer = \composerTenor + } +} \ No newline at end of file From 19e815bc0fb2d8587bd5f5b15c9a95543360e962 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone <ericteunis@gmail.com> Date: Fri, 18 Dec 2015 14:20:38 +0100 Subject: [PATCH 33/33] Seperated music from lilydrum --- .lilydrum/embellishments.ily | 109 -------- .lilydrum/flourish_symbols/butterfly.eps | 62 ----- .../flourish_symbols/st_andrews_crss.eps | 107 -------- .lilydrum/flourish_symbols/stop.eps | 50 ---- .lilydrum/flourishing.ily | 49 ---- .lilydrum/layout_tweaks.ily | 114 --------- .lilydrum/musical_functions.ily | 45 ---- .lilydrum/special_sticking.ily | 21 -- README.md | 14 - book/.gitignore | 7 - book/bass_book.tex | 22 -- book/clean | 2 - book/drums_book.tex | 22 -- book/full_book.tex | 22 -- book/init | 50 ---- book/load_scores | 34 --- book/makebook | 180 ------------- book/pipes_book.tex | 22 -- book/side_book.tex | 22 -- book/tenor_book.tex | 22 -- book/tex/main_bass.tex | 17 -- book/tex/main_drums.tex | 20 -- book/tex/main_full.tex | 13 - book/tex/main_pipes.tex | 14 - book/tex/main_side.tex | 58 ----- book/tex/main_tenor.tex | 24 -- book/tex/score_book.cls | 36 --- book/tex/titlepage.tex | 6 - cheatsheet.ly | 113 --------- example.ly | 24 -- lilydrum.ly | 34 --- makedrum | 240 ------------------ todo | 17 -- 33 files changed, 1592 deletions(-) delete mode 100755 .lilydrum/embellishments.ily delete mode 100755 .lilydrum/flourish_symbols/butterfly.eps delete mode 100755 .lilydrum/flourish_symbols/st_andrews_crss.eps delete mode 100755 .lilydrum/flourish_symbols/stop.eps delete mode 100755 .lilydrum/flourishing.ily delete mode 100755 .lilydrum/layout_tweaks.ily delete mode 100755 .lilydrum/musical_functions.ily delete mode 100755 .lilydrum/special_sticking.ily delete mode 100755 README.md delete mode 100644 book/.gitignore delete mode 100644 book/bass_book.tex delete mode 100644 book/clean delete mode 100644 book/drums_book.tex delete mode 100644 book/full_book.tex delete mode 100644 book/init delete mode 100644 book/load_scores delete mode 100644 book/makebook delete mode 100644 book/pipes_book.tex delete mode 100644 book/side_book.tex delete mode 100644 book/tenor_book.tex delete mode 100644 book/tex/main_bass.tex delete mode 100644 book/tex/main_drums.tex delete mode 100644 book/tex/main_full.tex delete mode 100644 book/tex/main_pipes.tex delete mode 100644 book/tex/main_side.tex delete mode 100644 book/tex/main_tenor.tex delete mode 100644 book/tex/score_book.cls delete mode 100644 book/tex/titlepage.tex delete mode 100755 cheatsheet.ly delete mode 100755 example.ly delete mode 100755 lilydrum.ly delete mode 100755 makedrum delete mode 100755 todo diff --git a/.lilydrum/embellishments.ily b/.lilydrum/embellishments.ily deleted file mode 100755 index a622958..0000000 --- a/.lilydrum/embellishments.ily +++ /dev/null @@ -1,109 +0,0 @@ -% ================================================= % -% Flams, Drags & the sort % -% ================================================= % -drumgrace = #(define-music-function (parser location notes ) ( ly:music? ) #{ - % Set settings - \stemUp - \once \override Beam.positions = #'(2 . 2) - \once \override DrumStaff.Stem.length = #5 - \override Flag.stroke-style = #"grace" - \override Score.GraceSpacing #'spacing-increment = #0 - \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5) - - % Print notes - \small \grace $notes - - % Revert back - \revert Score.Stem #'beamlet-default-length - \revert Flag.stroke-style - \stemNeutral -#}) - - -% Flams -flamd = \drummode { \drumgrace { g8 } } % Flam right -flamg = \drummode { \drumgrace { d8 } } % Flam left -flamddr = \drummode { \drumgrace { g8\startGroup } } % Flam right with start repeat -flamgdr = \drummode { \drumgrace { d8\startGroup } } % Flam left with start repeat - -% Drags -dragd = \drummode { \drumgrace { g16[ g] } } % Drag right -dragg = \drummode { \drumgrace { d16[ d] } } % Drag left -dragddr = \drummode { \drumgrace { g16[\startGroup g] } } % Drag right with start repeat -draggdr = \drummode { \drumgrace { d16[\startGroup d] } } % Drag left with start repeat - -% Open Drags -odragd = \drummode { \drumgrace { g16[ s^"o" g] } } % Open Drag right -odragg = \drummode { \drumgrace { d16[ s^"o" d] } } % Open Drag left -odragddr = \drummode { \drumgrace { g16[\startGroup s^"o" g] } } % Open Drag right with start repeat -odraggdr = \drummode { \drumgrace { d16[\startGroup s^"o" d] } } % Open Drag left with start repeat - -% Ruff -ruffg = \drummode { \drumgrace { g16[ d g] } } % Ruff right -ruffd = \drummode { \drumgrace { d16[ g d] } } % Ruff left -ruffgdr = \drummode { \drumgrace { g16[\startGroup d g] } } % Ruff right with start repeat -ruffddr = \drummode { \drumgrace { d16[\startGroup g d] } } % Ruff left with start repeat - -% Swiss Ruff -sruffg = \drummode { \drumgrace { g16[ d d] } } % Swiss Ruff right -sruffd = \drummode { \drumgrace { d16[ g g] } } % Swiss Ruff left -sruffgdr = \drummode { \drumgrace { g16[\startGroup d d] } } % Swiss Ruff right with start repeat -sruffddr = \drummode { \drumgrace { d16[\startGroup g g] } } % Swiss Ruff left with start repeat - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Embellishment functions, automatic left or right %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Flam -flam = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \flamg #} - #{ \flamd #}) - % print the note, else it won't show up - $note -#}) - -% Drag -drag = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \dragg #} - #{ \dragd #}) - % print the note, else it won't show up - $note -#}) -% Open Drag -odrag = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \odragg #} - #{ \odragd #}) - % print the note, else it won't show up - $note -#}) - -% Ruff -ruff = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \ruffg #} - #{ \ruffd #}) - % print the note, else it won't show up - $note -#}) - -% Swiss Ruff -sruff = #(define-music-function (parser location note) (ly:music?) #{ - % is note right-handed? then \flamd - % if left, then \flamg - #(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand") - #{ \sruffg #} - #{ \sruffd #}) - % print the note, else it won't show up - $note -#}) diff --git a/.lilydrum/flourish_symbols/butterfly.eps b/.lilydrum/flourish_symbols/butterfly.eps deleted file mode 100755 index ad99448..0000000 --- a/.lilydrum/flourish_symbols/butterfly.eps +++ /dev/null @@ -1,62 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner -%%Title: butterfly.eps -%%CreationDate: Tue Nov 3 18:58:20 2015 -%%DocumentData: Clean7Bit -%%LanguageLevel: 2 -%%Pages: 1 -%%BoundingBox: 14 14 28 23 -%%EndComments -%%BeginProlog -% Use own dictionary to avoid conflicts -10 dict begin -%%EndProlog -%%Page: 1 1 -% Translate for offset -14.173228346456694 14.173228346456694 translate -% Translate to begin of first scanline -0 8 translate -13 -8 scale -% Image geometry -13 8 8 -% Transformation matrix -[ 13 0 0 8 0 0 ] -% Strings to hold RGB-samples per scanline -/rstr 13 string def -/gstr 13 string def -/bstr 13 string def -{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop} -{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop} -{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop} -true 3 -%%BeginData: 521 ASCII Bytes -colorimage -s8N,fqu$Hrp$r(^J,~> -s8N,fqu$Hrp$r(^J,~> -s8N,fqu$Hrp$r(^J,~> -%,Fub,@p3Al">-rJFS-~> -%,Fub,@p3Al">-rJFS-~> -%,Fub,@p3Al">-rJFS-~> -%!VFFnjYIn8*9jOooah~> -%!VFFnjYIn8*9jOooah~> -%!VFFnjYIn8*9jOooah~> -!3Z>$"7e/Pci*kDS:C~> -!3Z>$"7e/Pci*kDS:C~> -!3Z>$"7e/Pci*kDS:C~> -!4)S'".KO$rr2otR",~> -!4)S'".KO$rr2otR",~> -!4)S'".KO$rr2otR",~> -%#Fo_s2eEn(3KNTjbJ?~> -%#Fo_s2eEn(3KNTjbJ?~> -%#Fo_s2eEn(3KNTjbJ?~> -%,#f`D0l$Xfg[Vp@e"s~> -%,#f`D0l$Xfg[Vp@e"s~> -%,#f`D0l$Xfg[Vp@e"s~> -s8N,`p\b$no^Mn\J,~> -s8N,`p\b$no^Mn\J,~> -s8N,`p\b$no^Mn\J,~> -%%EndData -showpage -%%Trailer -end -%%EOF diff --git a/.lilydrum/flourish_symbols/st_andrews_crss.eps b/.lilydrum/flourish_symbols/st_andrews_crss.eps deleted file mode 100755 index 71dd630..0000000 --- a/.lilydrum/flourish_symbols/st_andrews_crss.eps +++ /dev/null @@ -1,107 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.2 (http://cairographics.org) -%%CreationDate: Wed Nov 4 14:58:05 2015 -%%Pages: 1 -%%DocumentData: Clean7Bit -%%LanguageLevel: 3 -%%BoundingBox: 0 -1 21 19 -%%EndComments -%%BeginProlog -save -50 dict begin -/q { gsave } bind def -/Q { grestore } bind def -/cm { 6 array astore concat } bind def -/w { setlinewidth } bind def -/J { setlinecap } bind def -/j { setlinejoin } bind def -/M { setmiterlimit } bind def -/d { setdash } bind def -/m { moveto } bind def -/l { lineto } bind def -/c { curveto } bind def -/h { closepath } bind def -/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto - 0 exch rlineto 0 rlineto closepath } bind def -/S { stroke } bind def -/f { fill } bind def -/f* { eofill } bind def -/n { newpath } bind def -/W { clip } bind def -/W* { eoclip } bind def -/BT { } bind def -/ET { } bind def -/pdfmark where { pop globaldict /?pdfmark /exec load put } - { globaldict begin /?pdfmark /pop load def /pdfmark - /cleartomark load def end } ifelse -/BDC { mark 3 1 roll /BDC pdfmark } bind def -/EMC { mark /EMC pdfmark } bind def -/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def -/Tj { show currentpoint cairo_store_point } bind def -/TJ { - { - dup - type /stringtype eq - { show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse - } forall - currentpoint cairo_store_point -} bind def -/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore - cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def -/Tf { pop /cairo_font exch def /cairo_font_matrix where - { pop cairo_selectfont } if } bind def -/Td { matrix translate cairo_font_matrix matrix concatmatrix dup - /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point - /cairo_font where { pop cairo_selectfont } if } bind def -/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def - cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def -/g { setgray } bind def -/rg { setrgbcolor } bind def -/d1 { setcachedevice } bind def -%%EndProlog -%%BeginSetup -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -%%PageBoundingBox: 0 -1 21 19 -%%EndPageSetup -q 0 -1 21 20 rectclip q -Q q -0 18.4 20.801 -18.398 re W n -q -0 18.4 21 -19 re W n -[ 0.8 0 0 0.8 0 -0.00000038147 ] concat -/DeviceRGB setcolorspace -8 dict dup begin - /ImageType 1 def - /Width 26 def - /Height 23 def - /Interpolate true def - /BitsPerComponent 8 def - /Decode [ 0 1 0 1 0 1 ] def - /DataSource currentfile /ASCII85Decode filter /FlateDecode filter def - /ImageMatrix [ 1 0 0 -1 0 23 ] def -end -image -Gatm8gFo%9)#d/2gE[.Um;+hI3UEp%Xt3I?N/l1l9M:.%/M((/>\H_ta+]A=3YdQT;E&]$>p - h8S*.'p^e?KM&*c:JEl*lPlhY]"?n,#8_kBl([IGWlCjo:D5oCKl;_loW%4<C]5Uh!k@@"! - Ho%,9[sf4m-B6=G7H>[;3Kfk`i84XJ!hG'9ZZkmI]J8tcC:B[7P)8U^Qges79AqoD<S>2&" - uOF+^U@A0C*>jgD>CAK/&lJ9j'uVEpg"s`+"o;18kr!ISt:+ZmI'BL"Th:]!.gj=q^_R@ - X]DJQ$u5H]4b7UU=0]#?@q2[Ge^[ZUEJ&\*aYl%8>[`^T1GeWU:;>iV9u%AT&p-1*.r99JP - @%GUWrKf*?ai@Q._-:)H[E@o/:JKQ7L]d%@0Hh2Z.W<_Q7+NB"Dsb\.T!JW<%?&fO@G.<14 - RWqU/5`D!2En.g=c[pQ"ZSa])#]EAp.5+o("QE/hSbQ*:tO5,GV?I['$R7U:_JL91qo*-R[ - uH?9$s>q"VoB[\KV>aiWP:+r6*EZEeLiE$,pS6.O`E$X0%EG(m3STF.U<CubTkVbRIC$1[N - hq>$[%*#sWE+S@)%aar5I.TL"I"DT6HaWU0*<62pi1c@6K`%ma^jCCHHYL.#+pi]VpMi0/= - /R0o0hU+&=3a,W^+:nf*-78_W&F#ijXf\]IGeEbDG-hIM<f`<ZCmYCY#%'K`7:?uJ(=4pjb - $qWsR[\SJGtogjWE-&cpp$o:C2/Xq+WfR9[C%li<Kp,;>;gh-V8=a]5VA0ihIgKEj`7X2PR - ]-`3?68Nh%B8Mo)ReV]RB%3^':PN(W$]j)KQAFAu)?B=)\l,9DBMS\qn\QSR?F?*ak[[6UO - Uc(fHRFf\Fsj8uK!o;fUc($_un,Q4WseYD3Wq7Rpt%:.uWK*o=;.#s<5u#E+Lu*sDn-73Xj - $mjn=:YHJJCr%'<)QH"lqiM"_.0[tnHm$*a+md=r?4\5brK!qE0ba97&eXiYuWgdUAPsCGS - iUeN4IjIJuTL,)c==hP2jaV[oW1gH$ZDk+VCbh,sd2J*cEcMk">tF-*,B#?*i82/\4n9@l2 - JY#):A/5V5Q@+Tkl~> -Q -Q Q -showpage -%%Trailer -end restore -%%EOF diff --git a/.lilydrum/flourish_symbols/stop.eps b/.lilydrum/flourish_symbols/stop.eps deleted file mode 100755 index a663d4d..0000000 --- a/.lilydrum/flourish_symbols/stop.eps +++ /dev/null @@ -1,50 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner -%%Title: stop.eps -%%CreationDate: Wed Nov 4 21:02:56 2015 -%%DocumentData: Clean7Bit -%%LanguageLevel: 2 -%%Pages: 1 -%%BoundingBox: 14 14 23 33 -%%EndComments -%%BeginProlog -% Use own dictionary to avoid conflicts -10 dict begin -%%EndProlog -%%Page: 1 1 -% Translate for offset -14.173228346456693 14.173228346456693 translate -% Translate to begin of first scanline -0 18.747656542932134 translate -8.2488188976377952 -18.747656542932134 scale -% Variable to keep one line of raster data -/scanline 9 3 mul string def -% Image geometry -9 17 8 -% Transformation matrix -[ 9 0 0 17 0 0 ] -{ currentfile scanline readhexstring pop } false 3 -%%BeginData: 946 ASCII Bytes -colorimage -fffffff5f5f5fffffffffffffffffffffffffffffffffffffcfcfc -fafafaffffff4e4e4e0000000000000000004e4e4effffffffffff -ffffff4e4e4e000000ffffffffffffffffff0000004e4e4effffff -ffffff000000ffffffffffffffffffffffffffffff000000ffffff -ffffff000000ffffffffffffffffffffffffffffff000000ffffff -ffffff000000ffffffffffffffffffffffffffffff000000ffffff -ffffff4e4e4e000000ffffffffffffffffff0000004e4e4effffff -ffffffffffff4e4e4e0000000000000000004e4e4efffffff5f5f5 -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -ffffffffffffffffffffffff000000ffffffffffffffffffffffff -000000000000000000000000000000000000000000000000000000 -%%EndData -showpage -%%Trailer -end -%%EOF diff --git a/.lilydrum/flourishing.ily b/.lilydrum/flourishing.ily deleted file mode 100755 index bb63976..0000000 --- a/.lilydrum/flourishing.ily +++ /dev/null @@ -1,49 +0,0 @@ -% ================================================= % -% Tenor Flourishing % -% ================================================= % -% Part of lilydrum -splitTheFeather = \markup{ \musicglyph #"noteheads.s2xcircle"} -cartWheel = \markup { \musicglyph #"timesig.neomensural94" } -up = \markup { - %\center-column { - \combine - \draw-line #'(0 . -2) % draw stick - \arrow-head #Y #UP ##f - %} - } -bfly = \markup { - \epsfile #X #2 #"../lilydrum/flourish_symbols/butterfly.eps" -} -stop = \markup { - \epsfile #X #2 #"../lilydrum/flourish_symbols/stop.eps" - } -scoop = \markup { - \path #.2 #'( (moveto 0 0 ) - (lineto 3 1 ) - (lineto 6 0 ) - (lineto 7 1 ) - ) - } -scoopo = #(define-music-function (parser location beg notes) (ly:music? ly:music?) - #{ - %Set spanner from first to last note - $beg - \startGroup - $notes - \stopGroup - #}) -flourish = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'cross - $notes - \revert Staff.NoteHead.style - #}) -sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music?) - #{ - $notes - $end - #}) - -% stf = \splitTheFeather -% cart = \cartWheel -% fl = \flourish \ No newline at end of file diff --git a/.lilydrum/layout_tweaks.ily b/.lilydrum/layout_tweaks.ily deleted file mode 100755 index 054fdbd..0000000 --- a/.lilydrum/layout_tweaks.ily +++ /dev/null @@ -1,114 +0,0 @@ -% =================================================== % -% Layout tweaks for good defaults % -% =================================================== % - -% Note name defs : -% "d" for the right hand ("droite") and -% "g" for the left hand ("gauche") -drumPitchNames = -#(append '( - (d . right-hand) - (g . left-hand) - (right . right-hand) - (left . left-hand) - ) - drumPitchNames -) - -% Position according to the line : right hand above and left hand below -#(define pipeband-style '( - (right-hand () #f 1) - (left-hand () #f -1) - ) -) -\layout { - \context {% add hands to note definitions - \DrumStaff - drumStyleTable = #(alist->hash-table pipeband-style) - } -} -\layout { - indent = 0.0 - \context { - \DrumStaff - \name PipeBandDrumStaff - \alias DrumStaff - - % one line per staff - \override StaffSymbol.line-positions = #'(0) - - % bar line height - \override BarLine.bar-extent = #'(-2 . 2) - - % stems - \override Stem.direction = #DOWN % stems down - \override Stem.length = #8.5 % unbeamed stems length - \override Stem.stemlet-length = #1 % short stem length - - % beams - \override Beam.beam-thickness = #0.4 % beam-thickness - \override Beam.positions = #'(-3.8 . -3.8) % fix beams on one height - - % slurs and ties - \override Slur.direction = #UP % Slurs on top - \override Tie.direction = #UP % Ties on top - - % dynamics up - \dynamicUp - - % slurs below rolls number - %\override TextScript.outside-staff-priority = ##f - %\override TextScript.side-axis = #0 - %\override TextScript.staff-padding = #3 - %\override TextScript.X-offset = #1 % padding to stems - %\override TextScript.extra-offset = #'(-0.3 . 0) - - % tremolos (rolls) - \override StemTremolo.slope = #0.5 % slope - \override StemTremolo.beam-width = #1.5 % beam-width - \override StemTremolo.beam-thickness = #0.3 % beam-thickness - \override StemTremolo.extra-offset = #'(0 . 0.3) % vertical pos. position - - \override TupletBracket.bracket-visibility = #'if-no-beams - - % unison brackets - \consists "Horizontal_bracket_engraver" - \override HorizontalBracket.staff-padding = #3.5 % staff-padding - \override HorizontalBracket.direction = #UP % brackets above the staff - \override HorizontalBracket.bracket-flare = #'(0 . 0) % vertical brackets - - subdivideBeams = ##t - strictBeatBeaming = ##t - \numericTimeSignature - - } - \context { - \Score - \accepts "PipeBandDrumStaff" - - \override RehearsalMark.break-align-symbols = #'(clef) - \override RehearsalMark.padding = #3 - \override VoltaBracket.edge-height = #'(1.5 . 1.5) - } - \context { - \StaffGroup - \accepts "PipeBandDrumStaff" - } -} - -% =================================================== % -% *Shorts* for Naming % -% =================================================== % - -instrumentSide = "Side" -instrumentTenor = "Tenor" -instrumentBass = "Bass" -instrumentPipes = "Pipes" -shortInstrumentSide = "S.D." -shortInstrumentTenor = "T.D." -shortInstrumentBass = "B.D." -shortInstrumentPipes = "P." -composerSide = "" -composerTenor = "" -composerBass = "" -composerPipes = "" \ No newline at end of file diff --git a/.lilydrum/musical_functions.ily b/.lilydrum/musical_functions.ily deleted file mode 100755 index 7e34480..0000000 --- a/.lilydrum/musical_functions.ily +++ /dev/null @@ -1,45 +0,0 @@ -% ================================================= % -% Musical Functions % -% ================================================= % -% Part of lilydrum - -eighthBeaming = { - \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'( 2 2 ) -} -compoundEighthBeaming = { - \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'( 3 ) -} - -% triplet -triplet = #(define-music-function (parser location notes) (ly:music?) #{ \tuplet 3/2 { $notes } #}) - -% dynamics -v = #(define-event-function (parser location) () #{ \upbow #}) - -% repeat brackets -dr = #(define-event-function (parser location) () #{ \startGroup #}) -fr = #(define-event-function (parser location) () #{ \stopGroup #}) - -% dynamics with extended lines -dynLine = #(define-music-function - (parser location text) - (markup?) - #{ - \once \override TextSpanner.style = #'line - \once \override TextSpanner.bound-details.left.text = \markup { - \combine - \draw-line #'(0 . -1) - \draw-line #'(1 . 0) - \dynamic #text - } - \once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) } - #}) - -% still to add: a little 'u' -tutti = #(define-event-function (parser location notes) (ly:music?) #{ - \startGroup - $notes - \stopGroup - #}) diff --git a/.lilydrum/special_sticking.ily b/.lilydrum/special_sticking.ily deleted file mode 100755 index 7d72d1e..0000000 --- a/.lilydrum/special_sticking.ily +++ /dev/null @@ -1,21 +0,0 @@ -% ================================================= % -% Side Sticking (modifies note, or adds mark) % -% ================================================= % -% Part of lilydrum -backstick = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'cross - $notes - \revert Staff.NoteHead.style - #}) -crossstick = #(define-music-function (parser location notes) (ly:music?) - #{ - \temporary \override Staff.NoteHead.style = #'xcircle - $notes - \revert Staff.NoteHead.style - #}) -rimshot = #(define-music-function (parser location notes) (ly:music?) - #{ - $notes - - #}) diff --git a/README.md b/README.md deleted file mode 100755 index 370e0df..0000000 --- a/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# pipeband-drumming -First trial with github, purpose is to set up a lilypond file in the same way as there is a bagpipe.ly (see github.com/svenax/bagpipemusic). Main focus is on pipeband snare drumming. Note that it would be best if they are compatible to create fullscores (see fullscore/ folder for first set up of Black Bear) - -Somehow, the drums part in lilypond does not cover a notation with only right left. That is right is above the line and left is below it. In the same manner as the bagpipe.ly file, flams and drags are defined as a shortcut. - -There has been a lilypond include file earlier made by Simon Froger (which includes all of the above). So first version is a shameless copy. -This is meant to extend or translate some parts. - -The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970 - - -Currently, the most advanced scores are for Lady MacKenzie of Fairburn in strathspeys/lady_mackenzie_of_fairburn/*.ly -These scores are used for most of the layout. -The scores include a side, tenor, bass, pipes, fullscore for drums and a regular fullscore. \ No newline at end of file diff --git a/book/.gitignore b/book/.gitignore deleted file mode 100644 index 86753b4..0000000 --- a/book/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.pdf -*.aux -*.log -*.toc -images/* -scores/* -tmp/* diff --git a/book/bass_book.tex b/book/bass_book.tex deleted file mode 100644 index 52b951d..0000000 --- a/book/bass_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Scores Bass} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_bass.tex} -\end{document} diff --git a/book/clean b/book/clean deleted file mode 100644 index 936460e..0000000 --- a/book/clean +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rm -v *.log *.aux *.pyc diff --git a/book/drums_book.tex b/book/drums_book.tex deleted file mode 100644 index 5c0a96c..0000000 --- a/book/drums_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Drumscores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_drums.tex} -\end{document} diff --git a/book/full_book.tex b/book/full_book.tex deleted file mode 100644 index 6f171bc..0000000 --- a/book/full_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Fullscores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_full.tex} -\end{document} diff --git a/book/init b/book/init deleted file mode 100644 index 4e9ffc9..0000000 --- a/book/init +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -SHELLCMD='sh' -PYTHONCMD='python3.4' -LATEXCMD='pdflatex' - -#$SHELLCMD load_scores - -#$PYTHONCMD makebook -o tex/main_full.tex full -#$PYTHONCMD makebook -o tex/main_drums.tex drums -#$PYTHONCMD makebook -o tex/main_pipes.tex pipes -#$PYTHONCMD makebook -o tex/main_bass.tex bass -#$PYTHONCMD makebook -o tex/main_tenor.tex tenor -#$PYTHONCMD makebook -o tex/main_side.tex side snare - -for ins in tenor; -do - printf "\\documentclass{tex/score_book} - - \\title{Seaforth Highlanders of Holland\\\\ %s Scores} - \\author{Eric Teunis de Boone} - -\\begin{document} - -\\input{./tex/titlepage.tex} - -\\newpage -\\cleardoublepage -\\phantomsection -\\addcontentsline{toc}{section}{\contentsname} -\\begin{multicols}{2} - \\tableofcontents -\\end{multicols} - -%\\newpage -%\\input{./tex/playlist} -\\newpage -\\input{./tex/main_%s.tex} -\\end{document} -" "$instr" "$instr" -done; - -echo "All setup!" - -#read -p "Press [Enter] to compile *.tex" - -#for f in ./*.tex; -#do -# $LATEXCMD $f -#done; diff --git a/book/load_scores b/book/load_scores deleted file mode 100644 index 3bf4203..0000000 --- a/book/load_scores +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -MKDRUM_DIR="../" -MKDRUMCOMMAND=$MKDRUM_DIR"makedrum" -SCORES_DIR="./scores/" - -trap "echo Aborted!; exit;" SIGINT SIGTERM - -another_dir () { - d=$1 - for f in $d/* - do - if [ -d $f ]; then - another_dir $f - continue - fi - - if [ ! -f $f ]; then - continue - fi - - if [[ ! "$f" == *.ly ]]; then - continue - fi - - mkdir -p $SCORES_DIR${d/$MKDRUM_DIR} - #echo $SCORES_DIR${f/$MKDRUM_DIR} - $MKDRUMCOMMAND $f -d $SCORES_DIR${d/$MKDRUM_DIR} - done; -} - -for d in ${MKDRUM_DIR}*_marches ${MKDRUM_DIR}strathspeys ${MKDRUM_DIR}standards ${MKDRUM_DIR}jigs ${MKDRUM_DIR}airs ${MKDRUM_DIR}hornpipes ${MKDRUM_DIR}other -do - another_dir $d -done; diff --git a/book/makebook b/book/makebook deleted file mode 100644 index 5c8747b..0000000 --- a/book/makebook +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/python3.4 - -# To be Run: python3.4 makebook -v -o ./tex/main_pipes.tex pipes -# Uses a copy of the filestructure of pipeband-drumming to generate the body of a tex file - -import os -from argparse import ArgumentParser - -class MakeBook: - OUT = './tex/main.tex' - MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) - RUN_DIR = os.path.abspath(os.curdir) - SCORES_DIR = './scores/' - LY_DIR = '../' - ORDER_FILE = 'order.txt' - INSTRUMENTS = ['full','drums', 'pipes', 'bass', 'tenor', 'side','snare'] - def __init__(self): - - usage = __file__ - parser = ArgumentParser(usage) - parser.add_argument('-v','--verbose',default=False,action='store_true',dest='verbose', help='verbose') - parser.add_argument('instrument',default=False,nargs='*',help='Instruments to be included in the book') - parser.add_argument('-o','--output',default=self.OUT,help='Output file') - - self.args = parser.parse_args() - - if self.args.verbose: - self.vprint('Verbose output') - standards = ['standards'] - marches = ['2-4_marches', '3-4_marches', '4-4_marches', '5-4_marches', '6-8_marches'] - watch_folders = [ 'hornpipes', 'jigs', 'strathspeys', 'reels','other'] - watch_folders = marches + watch_folders - - # Run Path_walker over dirs - tune_dirs = [] - for d in watch_folders: - if d in marches: - continue - tune_dirs.append(d) - - # Ready f.out - try: - self.fout = open(self.args.output,'w+') - - self.fwrite(u'\\addcontentsline{toc}{section}{Standards}') - for d in standards: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=1) - self.fwrite(u'\\addcontentsline{toc}{section}{Marches}') - for d in marches: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d), level=1, content_line_level=2) - - for d in tune_dirs: - self.vprint() - self.vprint(os.path.join(self.SCORES_DIR,d)) - self.path_walker(os.path.join(self.SCORES_DIR,d)) - except IOError: - print('Cannot open {}'.format(self.OUT)) - except: - self.fout.close() - raise - - def vprint(self,line = None): - if self.args.verbose: - if line is None: - line = '' - print(line) - - def fwrite(self,line): - self.fout.write(line+'\n') - - def include_pdf (self,file, level): - title = False - self.vprint(file) - lilydir = file[:file.rfind('/')].replace(self.SCORES_DIR,self.LY_DIR) - if os.path.isdir(lilydir): - path = file[:file.rfind('/')] - #Try to load title from config file - if os.path.isfile(os.path.join(lilydir,'config.ily')): - self.vprint('Loading config file') - with open(os.path.join(lilydir,'config.ily'),'r') as f: - for line in iter(f): - if line.startswith('title'): - title = line[line.find('=')+1:]#Strip 'title=' - title = title[1:-1] #Strip Quotes - continue - - lilyfile = os.path.join(lilydir, file[file.rfind('-')+1:].replace('.pdf','.ly')) - if not title and os.path.isfile(lilyfile): - self.vprint('Look through lilyfile') - with open(lilyfile, 'r') as f: - for line in iter(f): - if line.strip().startswith('title'): - title = line[line.find('=')+1:]#Strip 'title=' - title = title[1:-1] #Strip Quotes - continue - if title: - ref = title - forbid = ' /!@#$%^&*()<>?\|;:\'"' - for s in forbid: - ref = ref.replace(s,'_') - if not title: - self.vprint('No title yet Found!') - last_slash = file.rfind('/') - last_dot = file.rfind('.') - - if file[file.rfind('.',0,last_dot)+1:file.rfind('.')] in self.INSTRUMENTS: - ref = file[file.rfind('/')+1:file.rfind('.')] - else : - ref = file[file.rfind('/',0,last_slash-1)+1:file.rfind('.')].replace('/','-') - # Make title from filename - title = ref - #Remove references to Instruments - for inst in self.INSTRUMENTS: - title = title.replace('-'+inst, '') - title = title.replace('.'+inst, '') - #Remove chars - title = title.replace('-','').replace('_',' ').title() - - title = title[1:-1].replace('\\n',' ') - - if not self.args.instrument: - for inst in self.INSTRUMENTS: - if inst in file: - title = title + ' ('+inst+')' - self.vprint('= '+title) - ref = 'p'+ref.strip('_').lower() - #string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+','+title+','+ref+'}, pagecommand={}]{'+file+'}' - string = u'\\includepdf[pages=-, addtotoc={1,'+('sub'*level)+'section,'+str(level+1)+',{'+title+'},'+ref+'}, pagecommand={}]{'+file+'}' - - self.fwrite(string) - return string - - def path_walker(self, a, level=None, content_line_level=None): - if not a: - return - if level is None: - level = 0 - if content_line_level is None: - content_line_level = 1 - # Do stuff - if level < content_line_level: - self.fwrite(u'\\mysection{'+('sub'*level)+'section}{'+a[a.rfind('/')+1:].replace('_',' ').replace('-','/').title()+'}') - newline = False - - if os.path.isfile(os.path.join(a, 'order.txt')): - self.vprint('Found order') - with open(os.path.join(a, self.ORDER_FILE)) as f: - line = f.readline().rstrip('\n') - while line: - self.path_walker(os.path.join(a,line), level+1) - line = f.readline().rstrip('\n') - else: - for root, dirs, files in os.walk(a,False): - for f in files: - if not f.endswith('.pdf'): - self.vprint('F! '+f) - continue - if self.args.instrument: - instr_in_file = False - for instr in self.args.instrument: - if instr in f: - self.vprint(instr) - instr_in_file = True - break - if not instr_in_file: - self.vprint('F! '+f) - continue - # Include file - self.vprint('F '+f) - if newline: - self.fwrite(u'\\newpage') - - newline = True - self.include_pdf(os.path.join(root,f), level+1) -# Run above -MakeBook(); diff --git a/book/pipes_book.tex b/book/pipes_book.tex deleted file mode 100644 index e0d65e6..0000000 --- a/book/pipes_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Pipe Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_pipes.tex} -\end{document} diff --git a/book/side_book.tex b/book/side_book.tex deleted file mode 100644 index f4fc484..0000000 --- a/book/side_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Side Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_side.tex} -\end{document} diff --git a/book/tenor_book.tex b/book/tenor_book.tex deleted file mode 100644 index ce5678b..0000000 --- a/book/tenor_book.tex +++ /dev/null @@ -1,22 +0,0 @@ -\documentclass{tex/score_book} - -\title{Seaforth Highlanders of Holland\\Tenor Scores} -\author{Eric Teunis de Boone} - -\begin{document} - -\input{./tex/titlepage.tex} - -\newpage -\cleardoublepage -\phantomsection -\addcontentsline{toc}{section}{\contentsname} -\begin{multicols}{2} - \tableofcontents -\end{multicols} - -%\newpage -%\input{./tex/playlist} -\newpage -\input{./tex/main_tenor.tex} -\end{document} diff --git a/book/tex/main_bass.tex b/book/tex/main_bass.tex deleted file mode 100644 index 2062be1..0000000 --- a/book/tex/main_bass.tex +++ /dev/null @@ -1,17 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standard},p6_8_standard}, pagecommand={}]{./scores/standards/standards-standards.bass.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-bass.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-bass.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-bass.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_drums.tex b/book/tex/main_drums.tex deleted file mode 100644 index 2529961..0000000 --- a/book/tex/main_drums.tex +++ /dev/null @@ -1,20 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-drums.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-drums.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-drums.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-drums.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-drums.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_full.tex b/book/tex/main_full.tex deleted file mode 100644 index f7b6de8..0000000 --- a/book/tex/main_full.tex +++ /dev/null @@ -1,13 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-full.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_pipes.tex b/book/tex/main_pipes.tex deleted file mode 100644 index 06b3d59..0000000 --- a/book/tex/main_pipes.tex +++ /dev/null @@ -1,14 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\mysection{subsection}{4/4 Marches} -\mysection{subsection}{5/4 Marches} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} -\mysection{section}{Jigs} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-pipes.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/main_side.tex b/book/tex/main_side.tex deleted file mode 100644 index d3a0555..0000000 --- a/book/tex/main_side.tex +++ /dev/null @@ -1,58 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{2/4 Standards},p2_4_standards}, pagecommand={}]{./scores/standards/standards-24_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 1},p3_4_standards_nsetting_1}, pagecommand={}]{./scores/standards/standards-34_standards1.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 2},p3_4_standards_n_setting_2}, pagecommand={}]{./scores/standards/standards-34_standards2.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{3/4 Standards Setting 3},p3_4_standards_n_setting_3}, pagecommand={}]{./scores/standards/standards-34_standards3.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{4/4 Standards},p4_4_standards}, pagecommand={}]{./scores/standards/standards-44_standards.side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-68_standards.side.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Black Bear},pblack_bear}, pagecommand={}]{./scores/2-4_marches/black_bear/2-4_marches-black_bear-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Duncan McInnes},pduncan_mcinnes}, pagecommand={}]{./scores/2-4_marches/duncan_mcinness/2-4_marches-duncan_mcinness-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.alt.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{MacKenzie Highlanders},pmackenzie_highlanders}, pagecommand={}]{./scores/2-4_marches/mackenzie_highlanders/2-4_marches-mackenzie_highlanders-side.pdf} -\mysection{subsection}{3/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{On the Road to Passchendaele},pon_the_road_to_passchendaele}, pagecommand={}]{./scores/3-4_marches/on_the_road_to_passchendaele/3-4_marches-on_the_road_to_passchendaele-side.pdf} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{51st Highland Division},p51st_highland_division}, pagecommand={}]{./scores/4-4_marches/51st_highland_division/4-4_marches-51st_highland_division-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Flett from Flotta},pflett_from_flotta}, pagecommand={}]{./scores/4-4_marches/flett_from_flotta/4-4_marches-flett_from_flotta-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Minstrel Boy},pminstrel_boy}, pagecommand={}]{./scores/4-4_marches/minstrel_boy/4-4_marches-minstrel_boy-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Rowan Tree},prowan_tree}, pagecommand={}]{./scores/4-4_marches/rowan_tree/4-4_marches-rowan_tree-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Scotland the Brave},pscotland_the_brave}, pagecommand={}]{./scores/4-4_marches/scotland_the_brave/4-4_marches-scotland_the_brave-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Wings},pwings}, pagecommand={}]{./scores/4-4_marches/wings/4-4_marches-wings-side.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-side.pdf} -\mysection{subsection}{6/8 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Hills of Glenorchy},phills_of_glenorchy}, pagecommand={}]{./scores/6-8_marches/hills_of_glenorchy/6-8_marches-hills_of_glenorchy-side.pdf} -\mysection{section}{Hornpipes} -\includepdf[pages=-, addtotoc={1,subsection,2,{Itchy Fingers},pitchy_fingers}, pagecommand={}]{./scores/hornpipes/itchy_fingers/hornpipes-itchy_fingers-side.pdf} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-side.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{A. A. Cameron's Strathspey},pa._a._cameron_s_strathspey}, pagecommand={}]{./scores/strathspeys/aa_camerons/strathspeys-aa_camerons-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-side.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-rolls.side.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} -\includepdf[pages=-, addtotoc={1,subsection,2,{Band of Brothers},pband_of_brothers}, pagecommand={}]{./scores/other/other-band_of_brothers.snare.pdf} diff --git a/book/tex/main_tenor.tex b/book/tex/main_tenor.tex deleted file mode 100644 index 1e034a4..0000000 --- a/book/tex/main_tenor.tex +++ /dev/null @@ -1,24 +0,0 @@ -\addcontentsline{toc}{section}{Standards} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{6/8 Standards},p6_8_standards}, pagecommand={}]{./scores/standards/standards-standards.tenor.pdf} -\addcontentsline{toc}{section}{Marches} -\mysection{subsection}{2/4 Marches} -\mysection{subsection}{3/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Castle Dangerous},pcastle_dangerous}, pagecommand={}]{./scores/3-4_marches/castle_dangerous/3-4_marches-castle_dangerous-tenor.pdf} -\mysection{subsection}{4/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Leaving of Liverpool},pthe_leaving_of_liverpool}, pagecommand={}]{./scores/4-4_marches/the_leaving_of_liverpool/4-4_marches-the_leaving_of_liverpool-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Old Rustic Bridge},pthe_old_rustic_bridge}, pagecommand={}]{./scores/4-4_marches/the_old_rustic_bridge/4-4_marches-the_old_rustic_bridge-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsubsection,3,{The Pikeman's March},pthe_pikeman_s_march}, pagecommand={}]{./scores/4-4_marches/the_pikemans_march/4-4_marches-the_pikemans_march-tenor.pdf} -\mysection{subsection}{5/4 Marches} -\includepdf[pages=-, addtotoc={1,subsubsection,3,{Cullen Bay},pcullen_bay}, pagecommand={}]{./scores/5-4_marches/cullen_bay/5-4_marches-cullen_bay-tenor.pdf} -\mysection{subsection}{6/8 Marches} -\mysection{section}{Hornpipes} -\mysection{section}{Jigs} -\includepdf[pages=-, addtotoc={1,subsection,2,{Seaforth Sticks},pseaforth_sticks}, pagecommand={}]{./scores/jigs/seaforth_sticks/jigs-seaforth_sticks-tenor.pdf} -\mysection{section}{Strathspeys} -\includepdf[pages=-, addtotoc={1,subsection,2,{Lady MacKenzie of Fairburn},plady_mackenzie_of_fairburn}, pagecommand={}]{./scores/strathspeys/lady_mackenzie_of_fairburn/strathspeys-lady_mackenzie_of_fairburn-tenor.pdf} -\newpage -\includepdf[pages=-, addtotoc={1,subsection,2,{Molly Connell},pmolly_connell}, pagecommand={}]{./scores/strathspeys/molly_connell/strathspeys-molly_connell-tenor.pdf} -\mysection{section}{Reels} -\mysection{section}{Other} diff --git a/book/tex/score_book.cls b/book/tex/score_book.cls deleted file mode 100644 index 635ca0e..0000000 --- a/book/tex/score_book.cls +++ /dev/null @@ -1,36 +0,0 @@ -\LoadClass{article} -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{score_book} -% -% Load packages -\RequirePackage[a4paper,margin=1in,landscape]{geometry} -\RequirePackage{pdfpages}%Includepdf -\RequirePackage{amsmath} -\RequirePackage{graphicx} -\RequirePackage{grffile} -\RequirePackage[dutch]{babel} -\RequirePackage{multicol}%Needed for toc -\RequirePackage{bookmark}%Needed for bookmark to toc -\RequirePackage{background} - \backgroundsetup{scale=0.7} - \backgroundsetup{angle=0} - \backgroundsetup{opacity=0.1} - \backgroundsetup{contents={\includegraphics[width=\textheight]{./images/seaforth_capbadge.jpg}}} -\RequirePackage{hyperref} - \hypersetup{colorlinks=false} -\RequirePackage{tocloft} -\PassOptionsToPackage{unicode}{hyperref} -\PassOptionsToPackage{naturalnames}{hyperref} -%\RequirePackage{chngpage} -% -% (Re)Set counters -\setcounter{secnumdepth}{-2}%Hides section no's -% -% Define commands -\newcommand{\mysection}[2]{ - \phantomsection - \stepcounter{#1} - \addtocontents{toc}{\cftpagenumbersoff{#1}}%cft for disabling page numbering - \addcontentsline{toc}{#1}{#2} - \addtocontents{toc}{\cftpagenumberson{#1}}%cft for enabling page numbering -} diff --git a/book/tex/titlepage.tex b/book/tex/titlepage.tex deleted file mode 100644 index 341ac10..0000000 --- a/book/tex/titlepage.tex +++ /dev/null @@ -1,6 +0,0 @@ -\NoBgThispage -\maketitle -\begin{center} -\includegraphics[width=0.3\textwidth]{./images/SEAFORTH_logo_PMS.pdf} -\end{center} - diff --git a/cheatsheet.ly b/cheatsheet.ly deleted file mode 100755 index 4f52497..0000000 --- a/cheatsheet.ly +++ /dev/null @@ -1,113 +0,0 @@ - -#(ly:set-option 'point-and-click #f) - -% Choose a size -#(set-global-staff-size 18) -#(set-default-paper-size "a4" 'landscape) - -\paper { - indent = 0\mm - ragged-right = ##t - ragged-bottom = ##t -} -\layout { - indent = 30\mm - \context { - \Score - \override NonMusicalPaperColumn #'line-break-permission = ##f - } -} - -\include "lilydrum.ly" - -\score { - \new PipeBandDrumStaff { - \set Staff.instrumentName = "Plain notes" - \drummode { - d4 g \crossstick d \crossstick g \rimshot d \rimshot g \backstick d \backstick g - } - } - \addlyrics { - "d" "g" "\crossstick d" "\crossstick g" "\rimshot d" "\rimshot g" "\backstick d" "\backstick g" - } -} - -\score { - \new PipeBandDrumStaff { - \set Staff.instrumentName = "Tenor Flourishing" - \drummode { - d^\splitTheFeather g^\cartWheel d^\up {d8 g8 d4} g d \flourish { d4 g d g } - } - } - \addlyrics { - "\splitTheFeather" "cartWheel" "up" "scoop d g d" "\flourish { }" - } -} - -\score { - \new PipeBandDrumStaff { - \set Staff.instrumentName = "Embellishments" - \time 2/4 - \drummode { - \flam d \flam g - \drag d \drag g - \odrag d \odrag g - \ruff d \ruff g - \sruff d \sruff g - } - } - \addlyrics { - "\flam d" "\flam g" - "\drag d" "\drag g" - "\odrag d" "\odrag g" - "\ruff d" "\ruff g" - "\sruff d" "\sruff g" - } -} -\score { - \new PipeBandDrumStaff { - \set Staff.instrumentName = \markup \column { \line{Forced hand} \line{embellishments}} - \time 2/4 - \drummode { - \flamg d \flamd g - \dragg d \dragd g - \odragg d \odragd g - \ruffg d \ruffd g - \sruffg d \sruffd g - } - } - \addlyrics { - "\flamg d" "\flamd g" - "\dragg d" "\dragd g" - "\odragg d" "\odragd g" - "\ruffg d" "\ruffd g" - "\sruffg d" "\sruffd g" - } -} -\score { - \new PipeBandDrumStaff { - \set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style) - \set Staff.instrumentName = "Rolls" - \drummode { - d4:32( d8:32)(-> g8) \flam d4 r8 d8:32( \dr | - \triplet { g16) d g } \drag d16. g32 d32 g d g d16. g32-> d16. d32 \flam g4 - } - } - \addlyrics { - \partial 8 - "d8:32(" "\\triplet " -- "\\flam d16." "g32" -- "\\drag g16" -- "\\triplet" "g:64" "d-> }" - } -} - -% # Writing parts -% rolls -% tuplets -% tutti -% accents ( > v ^) -% - -\header { - title = "Cheat sheet for entering pipeband drumming music" - subtitle = "Intended for Lilypond 2.18 or better" - tagline = \markup { "Cpl ET de Boone, Seaforths of Holland" } -} diff --git a/example.ly b/example.ly deleted file mode 100755 index ff1c9f1..0000000 --- a/example.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "2.18.2" -% include the lilydrum file -\include "lilydrum.ly" - -% Now a tiny example : -\score { - \new DrumStaff { - \drummode { - \time 6/8 - \partial 8 d8:32(_"7" | - \repeat volta 2 { - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16 g8 d4.:32(_"13" | - d8.) g16 d8 \flamg g4 d8:32(_"7" \fr | - \break - g8.[) g16 \dragd d8] d8.[ d16 \dragg g8] | - g8.[ \dragd d16 d8] d8.[ d16 \dragg g8] | - \flamddr d8. d16:64(_"5" d8) \flamd d8. d16 \flamg g8 | - d8.:32(_"5" d16) \flamg g8 \flamd d4. \fr | - } - } - } -} \ No newline at end of file diff --git a/lilydrum.ly b/lilydrum.ly deleted file mode 100755 index f905bcd..0000000 --- a/lilydrum.ly +++ /dev/null @@ -1,34 +0,0 @@ -\version "2.16.2" -%{ - LilyPond file definitions for Pipeband drumming scores. - Primarily focused on Snare drumming, - occasional bass or tenor scores should be possible. - - This file builds on work done by Simon Froger. - - Substantial changes by ET de Boone, Seaforth Highlanders of Holland (seaforth.nl) - Include by using : - \include "[pathtothisfile]" e.g. "~/lilydrum.ly" - - Music has to be put into : - \new DrumStaff { - \drummode { - [musique] - } - } - -%} - -% Note name defs : -% "d" for the right hand ("droite") and -% "g" for the left hand ("gauche") -%----------------------------------------- - -#(ly:set-option 'point-and-click #f) -#(ly:set-option 'relative-includes #t) - -\include ".lilydrum/layout_tweaks.ily" -\include ".lilydrum/musical_functions.ily" -\include ".lilydrum/embellishments.ily" -\include ".lilydrum/flourishing.ily" -\include ".lilydrum/special_sticking.ily" diff --git a/makedrum b/makedrum deleted file mode 100755 index 7458a22..0000000 --- a/makedrum +++ /dev/null @@ -1,240 +0,0 @@ -#!/usr/bin/python3.4 - -## Generate pdf form lilypond file -## by using standard command -## -## Most of programming was done by Sven Axelsson, http://svenax.net/ - -import codecs, os -from argparse import ArgumentParser - -class MakeDrum: - LILYPOND = 'lilypond' - VERSION = '0.9.5' - TMP_DIR = './tmp' - TMP_PREFIX = 'tmp_' - MASTER_DIR = os.path.dirname(os.path.abspath(__file__)) - RUN_DIR = os.path.abspath(os.curdir) - - def __init__(self): - # Gather options and create the template file - usage = __file__ - parser = ArgumentParser(usage) - - parser.add_argument('--version', - action='store_true', dest='show_version', default=False, - help='show makeDrum version and exit') - parser.add_argument('--lilyversion', - action='store_true', dest='show_lilyversion', default=False, - help='show Lilypond version and exit') - - parser.add_argument('-x', '--drumfile', - dest='lilydrum', default='lilydrum.ly', - help='Use the specified file for drums') - parser.add_argument('-c', '--pipefile', - dest='lilypipe', default='bagpipe.ly', - help='Use the specified file for pipes') - - parser.add_argument('-p', '--paper-size', - dest='papersize', default='a4', - help='Paper size. Default: A4') - parser.add_argument('-o', '--orientation', - dest='orientation', default='landscape', - help='Paper orientation. Default: landscape') - parser.add_argument('-s', '--staff-size', - dest='staffsize', default='20', - help='Staff size. Default: 16pt.') - parser.add_argument('-f', '--format', - dest='format', default=None, - help='Use header format file "header_{format}". Default: "header_default"') - parser.add_argument('-w', '--view-spacing', - action='store_true', dest='view_spacing', default=False, - help='Turn on "Paper.annotatespacing".') - - parser.add_argument('-g','--generated', - dest='gen_out', default=self.TMP_DIR, - help='Put generated lilyfiles in $gen_out') - parser.add_argument('--no-compile', default=True, - action='store_false', dest='compile', - help='Do not compile generated Lilypond files') - parser.add_argument('--no-log', - action='store_false', dest='log', default=True, - help='Do not generate log files.') - parser.add_argument('--no-cleanup', - action='store_false', dest='clean', default=True, - help='Leave all temporary files in place') - parser.add_argument('-d', '--out_dir', - dest='out_dir', default='pdf', - help='Output dir, for lilypond. If it doesn\'t exist, try to create it') - parser.add_argument('music_file', - default='', nargs='*', - help='file to process') - parser.add_argument('-@', '--list_file', - dest='list_file', default='', - help='list of files to process') - - self.args = parser.parse_args() - - if self.args.show_version: - print(__name__, ' ', self.VERSION) - return - - if self.args.show_lilyversion: - print(os.system(self.LILYPOND+' --version')) - return - - if self.args.view_spacing: - self.args.view_spacing = "##t" - else: - self.args.view_spacing = "##f" - - # Input files - if self.args.list_file != '': - self.args.music_file.append(open(self.args.list_file, 'r').readlines()) - close(self.args.list_file) - # Check for files - if not self.args.music_file: - parser.print_usage() - return - - - # Clean up of files - self.remove_tmp_dir = self.args.clean - - if not os.path.exists(os.path.join(os.path.curdir, self.TMP_DIR)): - try: os.makedirs(os.path.join(os.path.curdir, self.TMP_DIR)) - except: - print('Seems like no temporary directory can be created') - return - if not os.path.exists(os.path.join(os.path.curdir, self.args.out_dir)): - try: os.makedirs(os.path.join(os.path.curdir, self.args.out_dir)) - except: - print('Seems like no output directory can be created') - return - - os.chdir(self.MASTER_DIR) - for file_path in self.args.music_file: - self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path), self.args.gen_out, self.args.compile) - - #if not - #os.rmdir(self.TMP_DIR) - - os.chdir(self.RUN_DIR) - - def processit(self, tmp_dir, file, gen_out, compile): - if self.args.format is None: - if file.endswith(".book"): - header_format = "header_book" - else: - header_format = "header_default" - else: - header_format = "header_" + self.args.format - - tmp_file = self.maketemplate(tmp_dir, file, header_format) - - if gen_out is not None and gen_out != tmp_dir: - new_tmp_file = os.path.basename(tmp_file).replace(self.TMP_PREFIX, ''); - print ('Moving ', tmp_file, ' to ', new_tmp_file, end=' ', flush=True) - gen_dir = os.path.join(self.RUN_DIR, gen_out); - # if not dir $gen_out, make it - if not os.path.exists(gen_dir): - try: os.makedirs(gen_dir) - except: - print('[Error]') - print(' ! Seems like the {} directory cannot be created'.format(gen_dir)) - return - # mv file to dir, remove self.TMP_PREFIX - os.rename(tmp_file, os.path.join(gen_dir, new_tmp_file)) - tmp_file = new_tmp_file - print('[OK]') - - if compile: - if self.args.log: - logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).replace(".ly", '').replace('/', '-')+'.log') - log = ' > '+logfile+' 2>&1' - else: - log = '' - - print ('Compiling ', file, end=' ', flush=True) - if not self.args.log: - print() - lilyout = os.path.join(self.RUN_DIR, self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", '')) - print (lilyout) - lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log - - if os.system(lilycmd) != 0: - self.remove_tmp_dir = False - print ('[Error]') - if self.args.log: - print (' ! Did not compile, please see the log at ', logfile) - else : - print ('[OK]') - - if self.args.clean: - #remove files - if self.args.log: - os.remove(logfile) - os.remove(tmp_file) - - def maketemplate(self, tmp_dir, file, header_format): - lily_includes = '' - include_drum_file = False - include_pipe_file = False - # find out whether drum, pipes, or full score - for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: - if ext in file: - include_drum_file = True - for ext in ['full', 'pipes']: - if ext in file: - include_pipe_file = True - if include_drum_file: - lily_includes = lily_includes + u""" -\\include \""""+self.args.lilydrum+"""\" -""" - if include_pipe_file: - lily_includes = lily_includes + u""" -\\include \""""+self.args.lilypipe+"""\" -""" - - # set up a tmp file with template and file combined - tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-')) - - out_file = codecs.open(tmp_file, 'w+', 'utf8') - out_file.write(u'\ufeff') - - out_file.write(u""" -% Generated from """+file+""" by """+__file__+""" version """+self.VERSION+""" - -\\version "2.18.0" - -#(ly:set-option 'point-and-click #f) -"""+ lily_includes +""" - -\\include \""""+os.path.join(os.path.abspath(self.MASTER_DIR), header_format.strip(".ily")+""".ily""")+"""\" - -#(set-global-staff-size """+self.args.staffsize+""") -#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""") - -% The tune to generate. - """) - - # Read lily file into tmp file - music = codecs.open(file, 'r', 'utf8').read() - if music.startswith(u'\ufeff'): music = music[1:] - music = music.split(u'\n') - printit = 1 - for line in music: - if line.startswith(u'\\include "lilydrum.ly"'): continue - if line.startswith(u'\\include'): - # Rewrite includes to absolute location of file - incline = line.replace('\\include', '').strip('"\' ') - if not incline.startswith('\\'): #already absolute - incline = os.path.join(os.path.abspath(os.path.dirname(file)), incline) - line = "\\include \""+incline+"\"" - if printit: - out_file.write(line.replace('\r', '')+'\n') - out_file.close() - - # Return tmp_file_path - return tmp_file -MakeDrum(); diff --git a/todo b/todo deleted file mode 100755 index e0ff4bc..0000000 --- a/todo +++ /dev/null @@ -1,17 +0,0 @@ -TODO - * show 8th and 16th beats in beaming, currently only 8ths: d32[[ g] d[ g]] d32[[ g] d[ g]] - * Macro for tutti's (unisons) - - on just one note - - with open ending - * Macro for "Part 2 of $n" - * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming) - * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. However the flam function doesnt work that way (yet)) - * It's customary to have 4 bars per line for portrait and 8 for landscape... - - * SIDE sticking - rimshot default + cross - - * FLOURISHING short long note above-note - ups \up arrow-up - scoop \scoop arrow-right-(diag-up then diag-down) [propably start on beginning of note and filter out the last one] - (further EUSPBA symbols)