]> 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)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Tue, 12 Jul 2011 17:29:13 +0000 (19:29 +0200)
commit32776795a1be5c0ec472f59694510705607673b0
tree46c690f294af97ed2482a25542c236a4b4727cf0
parent4e96cd885b2e6998ad1c8e3e09c39301d0699502
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)
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