From be39706b40aedf11960c4d061e57ca519bfe8299 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Wed, 12 Mar 2008 18:17:45 +0100 Subject: [PATCH] Allow non-integer numbers as bend deltas, too This patch adds the ability to write microtone bends in lilypond (e.g. MusicXML supports such microtone bends where the delta is not an integer, but e.g. 3.5). Signed-off-by: Reinhold Kainhofer --- input/regression/bend-after.ly | 12 +++++++++++- .../regression/musicxml/02a-Notations-MusicXML.xml | 8 ++++---- ly/music-functions-init.ly | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/input/regression/bend-after.ly b/input/regression/bend-after.ly index 6cd8d1e..1d40e9d 100644 --- a/input/regression/bend-after.ly +++ b/input/regression/bend-after.ly @@ -3,7 +3,8 @@ \header { texidoc = "Falls and doits can be created with bendAfter. They run - to the next note, or to the next barline." + to the next note, or to the next barline. Microtone bends (i.e. + \bendAfter #3.5) are also supported." } @@ -22,4 +23,13 @@ c4-\bendAfter #-2 c4-\bendAfter #-3 c4-\bendAfter #-4 + c4-\bendAfter #-5 + c4-\bendAfter #3.5 + c4-\bendAfter #2.5 + c4-\bendAfter #1.5 + c4-\bendAfter #0.5 + c4-\bendAfter #-0.5 + c4-\bendAfter #-1.5 + c4-\bendAfter #-2.5 + c4-\bendAfter #-3.5 } diff --git a/input/regression/musicxml/02a-Notations-MusicXML.xml b/input/regression/musicxml/02a-Notations-MusicXML.xml index 7240873..e7339be 100644 --- a/input/regression/musicxml/02a-Notations-MusicXML.xml +++ b/input/regression/musicxml/02a-Notations-MusicXML.xml @@ -1030,10 +1030,10 @@ quarter - -5 + -0.5 - pre-bend -(0.)5 + pre-bend -0.5 @@ -1044,10 +1044,10 @@ quarter - 5 + 3.5 - bend release (3.)5 + bend release 3.5 diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index c887598..3bc61a2 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -144,7 +144,7 @@ breathe = 'elements (list (make-music 'BreathingEvent)))) bendAfter = -#(define-music-function (parser location delta) (integer?) +#(define-music-function (parser location delta) (number?) (make-music 'BendAfterEvent 'delta-step delta)) -- 1.5.4.4