]> git.donarmstrong.com Git - lilypond.git/commit
Fix issues 75 and 1256: Allow multiple concurrent slurs
authorReinhold Kainhofer <reinhold@kainhofer.com>
Sat, 2 Jul 2011 20:23:53 +0000 (22:23 +0200)
committerCarl Sorensen <c_sorensen@byu.edu>
Wed, 13 Jul 2011 18:45:35 +0000 (12:45 -0600)
commitebdea7566554c26f752de6c2bef25df47ec3ee42
treeeb8069a123b9e35dc61ab8aee8ee9c0626cba6c6
parent11763dd1b3e6747cdbb8bfc196e5d045660f8da2
Fix issues 75 and 1256: Allow multiple concurrent slurs

Rewrite the Slur_engraver and the Phrasing_slur_engraver to support
multiple concurrent slurs. The default lilypond syntax using parentheses
still supports only one slur at a time, but by adding a spanner-id property
to the (Phrasing)SlurEvent music expression, one can create multiple
concurrent slurs, each with a different spanner-id.

This finally allows appoggiaturas and acciaccaturas (which both create a
slur from the grace note the the next note) to be placed inside a slur.

If we observe a new slur start while a slur is already present, we now
totally ignore the new slur event, so it does not influence the appearance
of the existing slur (bug 1256)

Update regtest versions for backport
12 files changed:
input/regression/phrasing-slur-multiple.ly [new file with mode: 0644]
input/regression/slur-grace.ly [new file with mode: 0644]
input/regression/slur-multiple-linebreak.ly [new file with mode: 0644]
input/regression/slur-multiple.ly [new file with mode: 0644]
lily/phrasing-slur-engraver.cc
lily/slur-engraver.cc
lily/spanner.cc
ly/grace-init.ly
scm/define-grob-properties.scm
scm/define-grobs.scm
scm/define-music-properties.scm
scm/define-music-types.scm