Moved lilydrum directory

small changes to headers

.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 {

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 ")" }
         }
     }

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)

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"

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()

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 %