Update for inclusion files

lilydrum/embellishments.ily

@@ -54,47 +54,34 @@ sruffddr = \drummode { \drumgrace { d16[\startGroup g g] } }	% Swiss Ruff left
 %%	Embellishment functions, automatic left or right	%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% Flam
+autohand = #(define-music-function (parser location note left right) (ly:music? ly:music? ly:music?) #{
-flam = #(define-music-function (parser location note) (ly:music?) #{
+	#(newline)
-	% is note right-handed? then \flamd
+	#(display "Fix autohand function for arbitrary depth")
-	% if left, then \flamg
+	
 	#(if (string=? (symbol->string (ly:music-property note 'drum-type)) "left-hand")
-          #{ \flamg #}
+		#{ $left #}
-          #{ \flamd #})
+		#{ $right #})
 	% print the note, else it won't show up
 	$note
 #})
 
+% Flam
+flam = #(define-music-function (parser location note) (ly:music?) #{
+	\autohand $note { \flamg }  { \flamd }
+#})
+
 % Drag
 drag = #(define-music-function (parser location note) (ly:music?) #{
-	% is note right-handed? then \flamd
+    \autohand $note \dragg \dragd
-	% 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
+	\autohand $note \odragg \odragd
-	% 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
+	\autohand $note \ruffg \ruffd
-	% 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

lilydrum/flourishing.ily

@@ -44,6 +44,12 @@ sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music
 					$end
 				#})
 
-% stf = \splitTheFeather
+stf = #(define-music-function (parser location note) (ly:music?)
+	#{
+		$note ^\splitTheFeather
+		%\once \set TextScriptEvent.text = \splitTheFeather
+	#}
+)
+		
 % cart = \cartWheel
 % fl = \flourish

lilydrum/layout_tweaks.ily

@@ -24,6 +24,7 @@ drumPitchNames =
 )
 
 \layout {
+	indent = 0.0
 	\context {
 		\DrumStaff
 		\name PipeBandDrumStaff
@@ -31,9 +32,6 @@ drumPitchNames =
 		
 		drumStyleTable = #(alist->hash-table pipeband-style)
 
-		% trying midi are you?
-		\override DrumStaff.midiInstrument = #"drums"
-
 		% one line per staff
 		\override StaffSymbol.line-positions = #'(0)
 

lilydrum/midi.ily

@@ -3,19 +3,41 @@
 #(newline)
 #(display "Midi Support loaded")
 
-midiDrumPitches = 
+bassPitchOne		= #(ly:make-pitch -2 0 NATURAL)
-#(append `(
+bassPitchTwo		= #(ly:make-pitch -3 6 NATURAL)
-    (right-hand . ,(ly:make-pitch -2 2 DOUBLE-FLAT))
+
-    (left-hand . ,(ly:make-pitch -2 2 DOUBLE-FLAT))
+sidePitchOne		= #(ly:make-pitch -2 2 DOUBLE-FLAT)
-  )
+sidePitchTwo		= #(ly:make-pitch -2 1 NATURAL)
-  midiDrumPitches
+
-)
+tenorPitchOne		= #(ly:make-pitch -2 3 NATURAL)
+tenorPitchTwo		= #(ly:make-pitch -2 4 NATURAL)
+tenorPitchThree		= #(ly:make-pitch -2 5 NATURAL)
+tenorPitchFour		= #(ly:make-pitch -2 6 NATURAL)
+tenorPitchFive		= #(ly:make-pitch -1 0 NATURAL)
+tenorPitchSix		= #(ly:make-pitch -1 1 NATURAL)
+tenorPitchSeven		= #(ly:make-pitch -2 3 NATURAL)
+tenorPitchEight		= #(ly:make-pitch -2 3 NATURAL)
+tenorPitchNine		= #(ly:make-pitch -2 3 NATURAL)
+tenorPitchTen		= #(ly:make-pitch -2 3 NATURAL)
+tenorPitchEleven	= #(ly:make-pitch -2 3 NATURAL)
+
+% Default Pitches
+sideDefault = \sidePitchTwo
+bassDefault = \bassPitchTwo
+tenorDefault = \tenorPitchSeven
+
+midiDrumPitches.right-hand = \sideDefault
+midiDrumPitches.left-hand = \sideDefault
 
 \midi {
 	\context {
 		\DrumStaff
 		\name PipeBandDrumStaff
 		\alias DrumStaff
+
+		% trying midi are you?
+		midiInstrument = #"drums"
+
 		drumPitchTable = #(alist->hash-table midiDrumPitches)
 	}
 	\context {
@@ -29,24 +51,17 @@ midiDrumPitches =
 
 }
 
-side = {
+%setMidiHands = 
-% (ly:make-pitch -2 2 DOUBLE-FLAT)
+%#(define-music-function
-% (ly:make-pitch -2 1 NATURAL)
+%	(parser location pitch)
-}
+%	(ly:pitch?)
-bass = {
+%	(
-% (ly:make-pitch -3 6 NATURAL)
+%	 (display "Set Hands to pitch")
-% (ly:make-pitch -2 0 NATURAL)
+%	 #{
-}
+%		midiDrumPitches.right-hand = #pitch
-tenor = {
+%		midiDrumPitches.left-hand = #pitch
-% (ly:make-pitch -2 3 NATURAL)
+%
-% (ly:make-pitch -2 4 NATURAL)
+%		drumPitchTable = #(alist->hash-table midiDrumPitches)
-% (ly:make-pitch -2 5 NATURAL)
+%	 #}
-% (ly:make-pitch -2 6 NATURAL)
+%	)
-% (ly:make-pitch -1 0 NATURAL)
+%)
-% (ly:make-pitch -1 1 NATURAL)
-% (ly:make-pitch -2 3 NATURAL)
-% (ly:make-pitch -2 3 NATURAL)
-% (ly:make-pitch -2 3 NATURAL)
-% (ly:make-pitch -2 3 NATURAL)
-% (ly:make-pitch -2 3 NATURAL)
-}

lilydrum/musical_functions.ily

@@ -7,6 +7,10 @@ eighthBeaming = {
   \set baseMoment = #(ly:make-moment 1/8)
   \set beatStructure = #'( 2  2 )
 }
+eighthReelBeaming = {
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = #'( 4 4)
+}
 compoundEighthBeaming = {
   \set baseMoment = #(ly:make-moment 1/8)
   \set beatStructure = #'( 3 )