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] 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 %