diff options
| author | Nathan Chou <starrynte@gmail.com> | 2016-07-25 17:45:29 -0700 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2016-08-13 19:07:35 +0200 |
| commit | 12b68a3172f040e768b7d229aa14fb4838e75742 (patch) | |
| tree | 34958b013f03e4b9e95c7b43bd7d411224cf10f2 /ly | |
| parent | bd455870308f261a3b87c47a4a0077ea56a4e6fe (diff) | |
Issue 4954/1: Change spanner-id to be a key instead of a string
Also changes argument \= to be a key.
Backport-by: David Kastrup <dak@gnu.org>
Diffstat (limited to 'ly')
| -rw-r--r-- | ly/grace-init.ly | 4 | ||||
| -rw-r--r-- | ly/spanners-init.ly | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 6fe32f49fb..a46111e4d9 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,7 +1,7 @@ \version "2.17.6" -startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id "grace") -stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "grace") +startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id 'grace) +stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id 'grace) startGraceMusic = { diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 756a55579e..8d8a69444f 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,18 +1,15 @@ \version "2.19.29" "\\=" = -#(define-event-function (id event) (number-or-string? ly:event?) +#(define-event-function (id event) (key? ly:event?) (_i "This sets the @code{spanner-id} property of the following -@var{event} to the given @var{id} (numbers will be converted to a -string). This can be used to tell LilyPond how to connect overlapping +@var{event} to the given @var{id} (non-negative integer or symbol). +This can be used to tell LilyPond how to connect overlapping or parallel slurs or phrasing slurs within a single @code{Voice}. @lilypond[quote,verbatim] \\fixed c' { c\\=1( d\\=2( e\\=1) f\\=2) } @end lilypond\n") - (set! (ly:music-property event 'spanner-id) - (if (number? id) - (number->string id) - id)) + (set! (ly:music-property event 'spanner-id) id) event) startGroup = #(make-span-event 'NoteGroupingEvent START) |