From 94c729bd004cd1facc5bcf14f59f3b0ecb71e0ef Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Tue, 12 Jul 2016 11:19:49 +0200 Subject: [PATCH 1/3] Changed beaming base and added definitions for seconds and thirds --- lilydrum/layout_tweaks.ily | 4 ++++ lilydrum/musical_functions.ily | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily index f731ac6..490ac85 100755 --- a/lilydrum/layout_tweaks.ily +++ b/lilydrum/layout_tweaks.ily @@ -102,10 +102,14 @@ instrumentSide = "Side" instrumentTenor = "Tenor" instrumentBass = "Bass" instrumentPipes = "Pipes" +instrumentSecnd = "Seconds" +instrumentThrd = "Thirds" shortInstrumentSide = "S.D." shortInstrumentTenor = "T.D." shortInstrumentBass = "B.D." shortInstrumentPipes = "P." +shortInstrumentSecnd = "2nd" +shortInstrumentThrd = "3rd" composerSide = "" composerTenor = "" composerBass = "" diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily index 29b7a18..251cf5d 100755 --- a/lilydrum/musical_functions.ily +++ b/lilydrum/musical_functions.ily @@ -5,13 +5,13 @@ eighthBeaming = { \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'( 2 2 ) + \set beatStructure = #'( 2 ) } eighthReelBeaming = { \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'( 4 4) + \set beatStructure = #'( 4 ) } -compoundEighthBeaming = { +eighthCompoundBeaming = { \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'( 3 ) } From e0ee5bb7e053dc6cec735ee5c43ecd0d0b52dadd Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Fri, 15 Jul 2016 00:25:05 +0200 Subject: [PATCH 2/3] Only try to check for drum/pipe file if they are not set to '' --- makedrum | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/makedrum b/makedrum index 768c436..4237da6 100755 --- a/makedrum +++ b/makedrum @@ -29,10 +29,10 @@ class MakeDrum: help='show Lilypond version and exit') parser.add_argument('-x', '--drumfile', - dest='lilydrum', default=os.path.join(self.MASTER_DIR,'lilydrum.ly'), + dest='lilydrum', nargs='+', default=os.path.join(self.MASTER_DIR,'lilydrum.ly'), help='Use the specified file for drums') parser.add_argument('-c', '--pipefile', - dest='lilypipe', default='bagpipe.ly', + dest='lilypipe', nargs='+', default=os.path.join(self.MASTER_DIR,'bagpipe.ly'), help='Use the specified file for pipes') parser.add_argument('-i', '--include', dest='includes', nargs='*', default=[],action='append', @@ -96,9 +96,9 @@ class MakeDrum: # Input files if self.args.list_file != '': - with io.open(self.args.list_file, 'r', encoding='utf8') as list_file: - for line in list_file.readlines(): - self.args.music_file.append(line) + with io.open(self.args.list_file, 'r', encoding='utf8') as list_file: + for line in list_file.readlines(): + self.args.music_file.append(line) # Check for files if not self.args.music_file: @@ -185,21 +185,23 @@ 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']: - if ext in file: - include_drum_file = True - break - - for ext in ['full', 'pipes']: - if ext in file: - include_pipe_file = True - break + if self.args.lilydrum and self.args.lilydrum != '': + for ext in ['full', 'side', 'tenor', 'bass', 'drum', 'snare']: + if ext in file: + include_drum_file = True + break + if self.args.lilypipe and self.args.lilypipe != '': + 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) if include_pipe_file: self.args.includes.insert(0, 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('../','').replace('music/','',1).replace('/', '-')[:-3] + self.args.suffix + '.ly') @@ -217,6 +219,7 @@ class MakeDrum: if not incline.startswith('\\'): #already absolute incline = os.path.join(os.path.abspath(os.path.dirname(relpath)), incline) + if compilable: try: inc_file = io.open(incline,'r',encoding='utf8') From 3be1d220319be2ac5ba59cfd74307894b0518a25 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Thu, 20 Oct 2016 02:58:37 +0200 Subject: [PATCH 3/3] Added naming, updated readme --- README.md | 7 +------ lilydrum.ly | 1 + lilydrum/naming.ily | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 lilydrum/naming.ily diff --git a/README.md b/README.md index 370e0df..4ca3002 100755 --- 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. Note that it would be best if they are compatible to create fullscores (see fullscore/ folder for first set up of Black Bear) +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 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. @@ -7,8 +7,3 @@ 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 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/lilydrum.ly b/lilydrum.ly index 63b6db2..d4a89c2 100755 --- a/lilydrum.ly +++ b/lilydrum.ly @@ -28,6 +28,7 @@ #(ly:set-option 'relative-includes #t) \include "lilydrum/layout_tweaks.ily" +\include "lilydrum/naming.ily" \include "lilydrum/musical_functions.ily" \include "lilydrum/embellishments.ily" \include "lilydrum/flourishing.ily" diff --git a/lilydrum/naming.ily b/lilydrum/naming.ily new file mode 100644 index 0000000..ec37dc1 --- /dev/null +++ b/lilydrum/naming.ily @@ -0,0 +1,24 @@ +% =================================================== % +% *Shorts* for Naming % +% =================================================== % +#(newline) +#(display "Short naming loaded") + +instrumentSide = "Side" +instrumentTenor = "Tenor" +instrumentBass = "Bass" +instrumentPipes = "Pipes" +instrumentPipessecnd = "Seconds" +instrumentPipesthrd = "Thirds" +shortInstrumentSide = "S.D." +shortInstrumentTenor = "T.D." +shortInstrumentBass = "B.D." +shortInstrumentPipes = "P." +shortInstrumentPipessecnd = "P.2" +shortInstrumentPipesthrd = "P.3" +composerSide = "" +composerTenor = "" +composerBass = "" +composerPipes = "" +composerPipessecnd = "" +composerPipesthrd = ""