]> git.donarmstrong.com Git - lilypond.git/commit
Positions TupletNumber correctly when Script and Slur are present.
authorMike Solomon <mike@apollinemike.com>
Fri, 23 Mar 2012 08:30:41 +0000 (09:30 +0100)
committerMike Solomon <mike@apollinemike.com>
Fri, 23 Mar 2012 08:30:41 +0000 (09:30 +0100)
commitab8e2a788867c1539a014d7d74242715f340aa00
tree3247e788a6e9cfa173fc3d873eb847e0db841ccc
parenta001627a9609221f05631aaf0366795ce28f8437
Positions TupletNumber correctly when Script and Slur are present.

There was previously a circular dependency that went:

TupletNumber needs TupletBracket position
TupletBracket needs Script position
Script with avoid-slur set to around or outside needs Slur position
Slur needs TupletNumber position

This is avoided by not doing Script vs TupletBracket collision
avoidance for Scripts that (a) are encompassed by a slur; and (b)
have avoid-slur set to outside or around.  The worst-case scenario,
then, is the same collision that would have been present before
Slur vs TupletBracket collision avoidance was implemented.  A more
thorough solution would be to have an avoid-tuplet-bracket property
that functions like avoid-slur.
input/regression/tuplet-number-slur-script.ly [new file with mode: 0644]
lily/tuplet-bracket.cc