Updated README file, renamed folder

README.md

@@ -3,12 +3,14 @@
 Somehow, the drums part in lilypond does not cover a notation with only right left. That is right is above the line and left is below it. In the same manner as the bagpipe.ly file, flams and drags are defined as a shortcut.
 
 There has been a lilypond include file earlier, made by Simon Froger (which includes all of the above). So first version is a shameless copy. 
-The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970
+The original file can still be found at [http://lsr.di.unimi.it/LSR/Snippet?id=970](http://lsr.di.unimi.it/LSR/Snippet?id=970).
+
+[His website (French) can be found here](https://simonfroger.wordpress.com/lilypond/caisse-claire-ecossaise/)
 
 ## How to use
 ---------------------
 To make a pipeband drum staff simply use
-`\new PipeBandDrumStaff {`
+`\new PipeBandDrumStaff`.
 This creates a DrumStaff with a few specific changes.
 !! Note that you do not need to use PipeBandDrumStaff to use the rest.
 
@@ -44,46 +46,46 @@ You can use every regular drum character (such as `sn` or `bd`), as `d` and `g`
 -----------------
 Flams and Drags can be added using `\flam` and `\drag`. They can determine whether to be left or right by themselves for simple expressions.
 If a certain hand is needed they can be inserted directly by appending `d` or `g` to `flam`,`drag`,..
-A `\flam d` is equal to `\flamd d`
+A `\flam d` is equal to `\flamd d`.
 
 There are currently 4 such shortcuts:
-`\flam` - A Flam
+ * `\flam` - A Flam
-`\drag` - A Drag                                                  
+ * `\drag` - A Drag                                                  
-`\ruff` - A Ruff
+ * `\ruff` - A Ruff
-`\sruff` - A Swiss Ruff
+ * `\sruff` - A Swiss Ruff
 
 ### Unison Brackets (Side)
 ------------------
 Unison Brackets are triggered using `\dr`. 
-They need an endpoint which is defined by `\fr`
+They need an endpoint which is defined by `\fr`.
 
 ~~You can use `\tutti` for this aswell.
 It takes a music expression which is automagically put under brackets.~~~
 (not yet)
 
 Appending `dr` to the `\flam`'s  or `\drag`'s triggers the unison bracket.
-e.g. `\flamdr` of `\draggdr`
+e.g. `\flamdr` of `\draggdr`.
 
 ### Flourishing (Tenor)
 -------------
 A few flourishes have been added, most are from the [EUSPBA](http://www.euspba.org/resource/music/EUSPBA_drums_tenorflourishing.pdf):
-`\flourish`
+ * `\flourish`
-`\splitTheFeather`
+ * `\splitTheFeather`
-`\cartWheel`
+ * `\cartWheel`
-`\up`
+ * `\up`
-`\blfy`   - butterfly
+ * `\blfy`   - butterfly
-`\rblfy`  - reverse butterfly
+ * `\rblfy`  - reverse butterfly
-`\rthrow` - throw right
+ * `\rthrow` - throw right
-`\lthrow` - throw left
+ * `\lthrow` - throw left
-`\bthrow` - throw both
+ * `\bthrow` - throw both
-`\rpush`  - push right
+ * `\rpush`  - push right
-`\lpush`  - push left
+ * `\lpush`  - push left
-`\bpush`  - push both
+ * `\bpush`  - push both
-`\andrewStop` - St. Andrew's Stop
+ * `\andrewStop` - St. Andrew's Stop
-`\stop`
+ * `\stop`
 
 
-Scoops have not been created yet
+Scoops have not been created yet.
 
 ## TODO
 --------------------------
@@ -100,7 +102,10 @@ Scoops have not been created yet
  * It's customary to have 4 bars per line for portrait and 8 for landscape... (most of the time this can be accomplished by \break-ing every 8 measures and having enough notes in)
 
  * rimshot    `defaultnote + cross` 
+ * MIDI supporting:
+	- switching sound for Bass, Tenor and Side
+	- rolls (only for Sides)
 
  * scoop    `\scoop` arrow-right-(diag-up then diag-down) 
-[propably start on beginning of note and filter out the last one]
+[propably start on beginning of note and filter out the last one, figure out how to get positions from these notes ]
  * [further flourish symbols](http://www.euspba.org/resource/music/EUSPBA_drums_tenorflourishing.pdf)

lib/flourishing.ily

@@ -342,11 +342,7 @@ scoopo = #(define-music-function (parser location beg notes) (ly:music? ly:music
 				$notes
 				\stopGroup
 			#})
-sdcoop = #(define-music-function (parser location notes end) (ly:music? ly:music?)
+
-				#{
-					$notes
-					$end
-				#})
 %---------------------------------------------------%
 % music function definitions
 %---------------------------------------------------%

lib/layout_tweaks.ily

@@ -53,6 +53,8 @@ drumPitchNames =
 		% dynamics up
 		\dynamicUp
 
+		% This does not work nicely together with marking up flourishes
+
 		% slurs below rolls number
 		%\override TextScript.outside-staff-priority = ##f
 		%\override TextScript.side-axis = #0

lib/musical_functions.ily

@@ -56,8 +56,18 @@ 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?) #{
+tutti = #(define-music-function (mus) (ly:music?)
-	\startGroup
+	; By Jan-Peter Voigt,  Tue, 2 May 2017 11:10:46 +0200
-	$notes
+	(let* ((elms (ly:music-property mus 'elements))
-	\stopGroup
+		; first and last music-element ...
-	#})
+		(frst (first elms)) ; TODO test for list? and ly:music?
+		(lst (last elms)) ; TODO test for list? and ly:music?
+		(fartic (ly:music-property frst 'articulations '())) ; look
+for eventchords ...
+		(lartic (ly:music-property lst 'articulations '()))
+		)
+	(ly:music-set-property! frst 'articulations `(,@fartic ,(make-music 'NoteGroupingEvent 'span-direction -1)))
+	(ly:music-set-property! lst 'articulations `(,@lartic ,(make-music 'NoteGroupingEvent 'span-direction 1)))
+	#{
+		#mus
+	#}))

lib/special_sticking.ily

@@ -21,6 +21,14 @@ crossstick	= #(define-music-function (parser location notes) (ly:music?)
 rimshot		= #(define-music-function (parser location notes) (ly:music?)
 				#{
 					\temporary \override Staff.NoteHead.font-size = #1.2
+					%\temporary \override Staff.NoteHead.stencil = #ly:text-interface::print
+					%\temporary \override Staff.NoteHead.text = \markup {
+					%	\combine
+					%		\halign #-0.7 \draw-circle #0.85 #0.2 ##f
+					%		\musicglyph #"noteheads.normal"
+					%}
 					$notes 
+					%\revert Staff.NoteHead.stencil
+					%\revert Staff.NoteHead.text
 					\revert Staff.NoteHead.font-size
 				#})

lilydrum.ly

@@ -26,10 +26,10 @@
 
 #(ly:set-option 'relative-includes #t)
 
-\include "lilydrum/layout_tweaks.ily"
+\include "lib/layout_tweaks.ily"
-\include "lilydrum/musical_functions.ily"
+\include "lib/musical_functions.ily"
-\include "lilydrum/embellishments.ily"
+\include "lib/embellishments.ily"
-\include "lilydrum/flourishing.ily"
+\include "lib/flourishing.ily"
-\include "lilydrum/special_sticking.ily"
+\include "lib/special_sticking.ily"
-\include "lilydrum/rehearsal_marks.ily"
+\include "lib/rehearsal_marks.ily"
-\include "lilydrum/midi.ily"
+\include "lib/midi.ily"