From d36ebd47460911e19f6a3bc25f48bf169a1e67bd Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 8 Aug 2023 12:02:32 +0200
Subject: [PATCH 1/2] Wrong hands for Ruff embellishments

---
 lib/embellishments.ily | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/embellishments.ily b/lib/embellishments.ily
index 3f68101..18c6651 100644
--- a/lib/embellishments.ily
+++ b/lib/embellishments.ily
@@ -48,10 +48,10 @@ odragddr = \drummode { \drumgrace { << { d16[\dr d] } { s16 s32^\markup { \music
 odraggdr = \drummode { \drumgrace { << { g16[\dr g] } { s16 s32^\markup { \musicglyph #"scripts.open" } } >> } }	% Open Drag left  with start repeat
 
 % Ruff
-ruffg =   \drummode { \drumgrace { g16[ d g] } }	% Ruff right
-ruffd =   \drummode { \drumgrace { d16[ g d] } }	% Ruff left
-ruffgdr = \drummode { \drumgrace { g16[\dr d g] } }	% Ruff right with start repeat
-ruffddr = \drummode { \drumgrace { d16[\dr g d] } }	% Ruff left  with start repeat
+ruffg =   \drummode { \drumgrace { d16[ g d] } }	% Ruff right
+ruffd =   \drummode { \drumgrace { g16[ d g] } }	% Ruff left
+ruffgdr = \drummode { \drumgrace { d16[\dr g d] } }	% Ruff right with start repeat
+ruffddr = \drummode { \drumgrace { g16[\dr d g] } }	% Ruff left  with start repeat
 
 % Swiss Ruff
 sruffg =   \drummode { \drumgrace { g16[ d d] } }		% Swiss Ruff right

From 04633ac833cc532fff387b64597d61859be8d5ec Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Tue, 8 Aug 2023 12:31:06 +0200
Subject: [PATCH 2/2] Closes #18: tutti misalign on ending flam

---
 lib/layout_tweaks.ily     | 2 ++
 lib/musical_functions.ily | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/layout_tweaks.ily b/lib/layout_tweaks.ily
index ad84b20..f586070 100644
--- a/lib/layout_tweaks.ily
+++ b/lib/layout_tweaks.ily
@@ -74,6 +74,8 @@ drumPitchNames =
 		\override HorizontalBracket.staff-padding = #3.5		% staff-padding
 		\override HorizontalBracket.direction = #UP			% brackets above the staff
 		\override HorizontalBracket.bracket-flare = #'(0 . 0)	% vertical brackets
+		\override HorizontalBracket.outside-staff-priority = #100
+		\override HorizontalBracket.to-barline = ##t
 
 		subdivideBeams = ##t
 		strictBeatBeaming = ##t
diff --git a/lib/musical_functions.ily b/lib/musical_functions.ily
index 1b2855e..889c378 100644
--- a/lib/musical_functions.ily
+++ b/lib/musical_functions.ily
@@ -115,13 +115,10 @@ tutti =
 		)
 		(if (> (length es) 1)
 			#{% multiple notes
-				\once \override HorizontalBracket.to-barline = ##t
-				\override HorizontalBracket.connect-to-neighbor = #'(#t #t)
+				\once \override HorizontalBracket.connect-to-neighbor = #'(#t #t)
 				<>\dr
-				#(allbutlastnote myMusic)
-				<>\fr
-				#(lastnote myMusic)
-				\revert HorizontalBracket.connect-to-neighbor
+				#myMusic
+				\fr
 			#}
 			#{% single note
 				<>\rn