From a555d378d1b8638a91e84441e1ca50b739b174fe Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Thu, 2 Feb 2017 17:06:20 +0100
Subject: [PATCH] Changed symbol for backsticking Added TODO for
 musical_functions Changed flourish symbol

---
 lilydrum/flourishing.ily       |  4 ++--
 lilydrum/layout_tweaks.ily     |  3 +++
 lilydrum/midi.ily              | 15 ++++++++++-----
 lilydrum/musical_functions.ily |  5 ++++-
 lilydrum/special_sticking.ily  | 15 ++++++++++-----
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/lilydrum/flourishing.ily b/lilydrum/flourishing.ily
index 0df0917..e60cef4 100644
--- a/lilydrum/flourishing.ily
+++ b/lilydrum/flourishing.ily
@@ -18,14 +18,14 @@ up = ^\markup \center-column {% Arrow-head and line do not line up nicely most o
 				\draw-line #'(0 . -3) % draw stick
 		%}
 	}
-blfy = ^\markup \center-column { &infty; }
+bfly = ^\markup \center-column { \char ##x221E }
 rblfy = ^\markup \center-column {
 	  \line{
 		\combine
 			\arrow-head #X #LEFT ##f
 			\draw-line #'(3 . 0 )
 		}
-		\line {	&infy; }
+		\line {	\char ##x221E }
 }
 
 rthrow = ^\markup \center-column {
diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily
index 1309cbb..53d2d84 100644
--- a/lilydrum/layout_tweaks.ily
+++ b/lilydrum/layout_tweaks.ily
@@ -106,3 +106,6 @@ drumPitchNames =
 		\accepts "PipeBandDrumStaff"
 	}
 }
+
+% Explicit bar lines (End + Repeat)
+#(define-bar-line ".|:-|." "|." ".|:" "|.")
diff --git a/lilydrum/midi.ily b/lilydrum/midi.ily
index 5e9c8c4..d09de4f 100644
--- a/lilydrum/midi.ily
+++ b/lilydrum/midi.ily
@@ -11,10 +11,10 @@ sidePitchTwo		= #(ly:make-pitch -2 1 NATURAL)
 
 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)
+tenorPitchThree		= #(ly:make-pitch -2 5 NATURAL)%
+tenorPitchFour		= #(ly:make-pitch -2 6 NATURAL)%
+tenorPitchFive		= #(ly:make-pitch -1 0 NATURAL)%Seems the nicest
+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)
@@ -24,11 +24,16 @@ tenorPitchEleven	= #(ly:make-pitch -2 3 NATURAL)
 % Default Pitches
 sideDefault = \sidePitchTwo
 bassDefault = \bassPitchTwo
-tenorDefault = \tenorPitchSeven
+tenorDefault = \tenorPitchFive
 
 midiDrumPitches.right-hand = \sideDefault
 midiDrumPitches.left-hand = \sideDefault
 
+midiTenor = {
+  \set midiDrumPitches.right-hand = \tenorDefault
+  \set midiDrumPitches.left-hand = \tenorDefault
+}
+
 \midi {
 	\context {
 		\DrumStaff
diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily
index b3aa788..3f52996 100644
--- a/lilydrum/musical_functions.ily
+++ b/lilydrum/musical_functions.ily
@@ -50,9 +50,12 @@ dynLine = #(define-music-function
 	#})
 
 % unison brackets
-% still to add: a little 'u'
+% TODO: a little 'u'
+% TODO: open ended brackets(\odr,\ofr)
 dr = #(define-event-function (parser location) () #{ \startGroup #})
 fr = #(define-event-function (parser location) () #{ \stopGroup #})
+odr = #(define-event-function (parser location) () #{ \startGroup #})
+ofr = #(define-event-function (parser location) () #{ \stopGroup #})
 tutti = #(define-event-function (parser location notes) (ly:music?) #{
 	\startGroup
 	$notes
diff --git a/lilydrum/special_sticking.ily b/lilydrum/special_sticking.ily
index 7d72d1e..5556881 100644
--- a/lilydrum/special_sticking.ily
+++ b/lilydrum/special_sticking.ily
@@ -4,18 +4,23 @@
 % Part of lilydrum
 backstick	= #(define-music-function (parser location notes) (ly:music?)
 				#{
-					\temporary \override Staff.NoteHead.style = #'cross
-					$notes
+					\temporary \override Staff.NoteHead.style = #'triangle
+					\temporary \override Staff.NoteHead.font-size = #1.2
+					$notes 
+					\revert Staff.NoteHead.font-size
 					\revert Staff.NoteHead.style
 				#})
 crossstick	= #(define-music-function (parser location notes) (ly:music?)
 				#{
 					\temporary \override Staff.NoteHead.style = #'xcircle
-					$notes
+					\temporary \override Staff.NoteHead.font-size = #1.2
+					$notes 
+					\revert Staff.NoteHead.font-size
 					\revert Staff.NoteHead.style
 				#})
 rimshot		= #(define-music-function (parser location notes) (ly:music?)
 				#{
-					$notes
-
+					\temporary \override Staff.NoteHead.font-size = #1.2
+					$notes 
+					\revert Staff.NoteHead.font-size
 				#})