Typo in Alexander MacKenzie

Added Swiss Ruff
Put Flams/Drags/Ruffs style in own command, instead of relying on {start|stop}GraceMusic

.gitignore

@@ -0,0 +1,6 @@
+*.ps
+*.pdf
+*.png
+*.log
+bwwtolily.py
+_output/

airs/alexander_mackenzie.ly

@@ -28,14 +28,14 @@
         % Part 2 ( Part 2.2 = Part 1)
 				d8:32(
 				g4) \flamd d16. g32 d8:32( g8) \flamd d8 |
-				d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32  d4-> d8:32( |
+				d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32  d4-> d8:32( |
 				g4) \flamd d16. g32 d8:32( g8.) g16 |
 				d4.:32( d4) d8:32( |
 
 				\break
 
 				g4) \flamd d16. g32 d8:32( g8) \flamd d8 |
-				d32-> g32 d32 g32 d32 g32 d32-> g32 d32 g32 d32 g32 d4-> \flamd d16. g32 |
+				d32-> g32 d32 g32 d32 g32 d32 g32-> d32 g32 d32 g32 d4-> \flamd d16. g32 |
 				d8:32( g16.) d32-> g16. g32 d8:32( g16.) d32-> g16. g32 |
 				d4.:32( d4)
 

lilydrum.ly

@@ -1,11 +1,11 @@
 %{
 	LilyPond file definitions for Highland snare drum scores.
-	
+
 	This file was first created by Simon Froger.
 
 	Include by using :
 	\include "[path]/lilydrum.ly"
-	
+
 	Music has to be put into :
 	\new DrumStaff {
 		\drummode {
@@ -37,7 +37,7 @@ drumPitchNames =
 	indent = 0
 	% rolls number : markups should be preceeded by
 	\textLengthOn
-	
+
 	% dynamics up
 	\dynamicUp
 	\set DrumStaff.drumStyleTable = #(alist->hash-table pipebandsnaredrums)
@@ -48,20 +48,20 @@ drumPitchNames =
 		% bar line length
 		\override BarLine.bar-extent = #'(-2 . 2)
 		% stems
-		\override Stem.direction = #-1 		 % stems down 
+		\override Stem.direction = #-1 		 % stems down
 		\override Stem.length = #11		 % unbeamed stems lenght
-		\override Stem.stemlet-length = #1.5 	 % short stem length 
+		\override Stem.stemlet-length = #1.5 	 % short stem length
 		% beam at same height
 		\override Beam.positions = #'(-5.5 . -5.5)
-		% slurs below rolls number 
+		% slurs below rolls number
 		\override TextScript.outside-staff-priority = ##f
 		\override TextScript.side-axis = #0
 		\override TextScript.staff-padding = #3
 		\override TextScript.X-offset = #2 			% padding to stems
 		\override TextScript.extra-offset = #'(-0.3 . 0)
 		% tremolos (rolls)
-		\override StemTremolo.slope = #0.5			% slope 
+		\override StemTremolo.slope = #0.5			% slope
-		\override StemTremolo.beam-width = #1.5			% beam-width 
+		\override StemTremolo.beam-width = #1.5			% beam-width
 		\override StemTremolo.beam-thickness = #0.3		% beam-thickness
 		\override StemTremolo.extra-offset = #'(0 . 0.6)	% vertical pos. position
 		%\override StemTremolo.Y-offset = #-3.3
@@ -84,7 +84,7 @@ v = #(define-event-function (parser location) ()
   #{ \upbow #}
 )
 
-% repeat brackets 
+% repeat brackets
 dr = #(define-event-function (parser location) ()
   #{ \startGroup #}
 )
@@ -93,7 +93,7 @@ fr = #(define-event-function (parser location) ()
 )
 
 
-% dynamics with extended lines 
+% dynamics with extended lines
 dynLine = #(define-music-function
 	(parser location text)
 	(markup?)
@@ -108,34 +108,42 @@ dynLine = #(define-music-function
 		\once \override TextSpanner.bound-details.right.text = \markup { \draw-line #'(0 . -1) }
 	#})
 
-% grace notes
+% =================================================
-startGraceMusic = {
+% Flams, Drags & the sort
-	\stemUp \tiny
+% =================================================
-	\override Flag.stroke-style = #"grace"		
+drumgrace = #(define-music-function (parser location notes) (ly:music?) #{
-	\once \override Beam.positions = #'(3 . 3)	
+	\stemUp
-	\once \override DrumStaff.Stem.length = #7	
+	\override Flag.stroke-style = #"grace"
-}
+	\once \override Beam.positions = #'(3 . 3)
-
+	\once \override DrumStaff.Stem.length = #7
-stopGraceMusic =  {
+	\override Score.GraceSpacing #'spacing-increment = #0
+	\override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
+	\tiny \grace $notes \normalsize
+	\revert Score.Stem #'beamlet-default-length
 	\revert Flag.stroke-style
-	\normalsize
 	\stemNeutral
-}
+#})
 
-% Flams 
+% Flams
-flamd = \drummode { \grace { g8 } }			% right Flam 
+flamd = \drummode { \drumgrace { g8 } }			% right Flam
-flamddr = \drummode { \grace { g8\startGroup } }	% with start repeat  
+flamddr = \drummode { \drumgrace { g8\startGroup } }	% with start repeat
-flamg = \drummode { \grace { d8 } }			% left Flam 
+flamg = \drummode { \drumgrace { d8 } }			% left Flam
-flamgdr = \drummode { \grace { d8\startGroup } }	% with start repeat  
+flamgdr = \drummode { \drumgrace { d8\startGroup } }	% with start repeat
 
 % Drags
-dragd = \drummode { \grace{ g16[ g] }}			% right Drag 
+dragd = \drummode { \drumgrace{ g16[ g] }}			% right Drag
-dragddr = \drummode { \grace{ g16[\startGroup g] }} 	% with start repeat
+dragddr = \drummode { \drumgrace{ g16[\startGroup g] }} 	% with start repeat
-dragg = \drummode { \grace{ d16[ d] }}			% left Drag
+dragg = \drummode { \drumgrace{ d16[ d] }}			% left Drag
-draggdr = \drummode { \grace{ d16[\startGroup d] }} 	% with start repeat
+draggdr = \drummode { \drumgrace{ d16[\startGroup d] }} 	% with start repeat
 
 % Ruff
-ruffg = \drummode { \grace{ g16[ d g] }}		% left Ruff
+ruffg = \drummode { \drumgrace{ g16[ d g] }}		% left Ruff
-ruffgdr = \drummode { \grace{ g16[\startGroup d g] }}	% with start repeat
+ruffgdr = \drummode { \drumgrace{ g16[\startGroup d g] }}	% with start repeat
-ruffd = \drummode { \grace{ d16[ g d] }}		% right Ruff
+ruffd = \drummode { \drumgrace{ d16[ g d] }}		% right Ruff
-ruffd = \drummode { \grace{ d16[\startGroup g d] }}	% with start repeat
+ruffd = \drummode { \drumgrace{ d16[\startGroup g d] }}	% with start repeat
+
+% Swiss Ruff
+sruffg = \drummode { \drumgrace{ g16[ d d] }}		% left Swiss Ruff
+sruffgdr = \drummode { \drumgrace{ g16[\startGroup d d] }}	% with start repeat
+sruffd = \drummode { \drumgrace{ d16[ g g] }}		% right Swiss Ruff
+sruffd = \drummode { \drumgrace{ d16[\startGroup g g] }}	% with start repeat