Re: Sketch for fix of issue 307 (issue4813048)
This needs an update to be applied. Cheers, Bertrand http://codereview.appspot.com/4813048/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Sketch for fix of issue 307 (issue4813048)
On Jul 26, 2011, at 5:01 AM, hanw...@gmail.com wrote: regtest missing. http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc File lily/slur-scoring.cc (right): http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc#newcode286 lily/slur-scoring.cc:286: end_ys[d] += additional_ys + 0.5; // 0.5 = m4g1c padding over extra encompass. make tweakable? magic Do you need the 0.5 at all? The quanting and the shape of the slur already offer quite some flexibility. The test case from the tracker doesn't work without the 0.5, which is truly a magic number that represents that which was necessary to make the test case work and not look ugly. I'll add a regtest later today. Cheers, MS ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Sketch for fix of issue 307 (issue4813048)
On 2011/07/26 06:14:47, mike_apollinemike.com wrote: On Jul 26, 2011, at 5:01 AM, mailto:hanw...@gmail.com wrote: regtest missing. http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc File lily/slur-scoring.cc (right): http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc#newcode286 lily/slur-scoring.cc:286: end_ys[d] += additional_ys + 0.5; // 0.5 = m4g1c padding over extra encompass. make tweakable? magic Do you need the 0.5 at all? The quanting and the shape of the slur already offer quite some flexibility. The test case from the tracker doesn't work without the 0.5, which is truly a magic number that represents that which was necessary to make the test case work and not look ugly. I'll add a regtest later today. Cheers, MS I did some math to be able to scrub the padding added a regtest. Cheers, MS http://codereview.appspot.com/4813048/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Sketch for fix of issue 307 (issue4813048)
On 2011/07/24 14:43:16, MikeSol wrote: Please don't run regtests yet on this patch - it is up to see if people are OK with this approach. It is a brute-force approach that will slow down lilypond for slurs that have extra-object-collisions, but I think it'll cover the grand majority of cases. Ran regtests on my nex VirtualBox LilyBuntu (which is faster than my native mac OS!). There is one regression that comes up in grace-sync.ly, but this is because of issue 1782. Cheers, MS http://codereview.appspot.com/4813048/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Sketch for fix of issue 307 (issue4813048)
regtest missing. http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc File lily/slur-scoring.cc (right): http://codereview.appspot.com/4813048/diff/3001/lily/slur-scoring.cc#newcode286 lily/slur-scoring.cc:286: end_ys[d] += additional_ys + 0.5; // 0.5 = m4g1c padding over extra encompass. make tweakable? magic Do you need the 0.5 at all? The quanting and the shape of the slur already offer quite some flexibility. http://codereview.appspot.com/4813048/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Sketch for fix of issue 307 (issue4813048)
Reviewers: , Message: Please don't run regtests yet on this patch - it is up to see if people are OK with this approach. It is a brute-force approach that will slow down lilypond for slurs that have extra-object-collisions, but I think it'll cover the grand majority of cases. Description: Sketch for fix of issue 307 Please review this at http://codereview.appspot.com/4813048/ Affected files: M lily/slur-scoring.cc Index: lily/slur-scoring.cc diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 63160a99171872556acb773a43bc046b773ebdce..81b3bac7996183fa6643fe54d96de179b07ac595 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -263,11 +263,27 @@ Slur_score_state::fill (Grob *me) Drul_arrayReal end_ys = get_y_attachment_range (); + extra_encompass_infos_ = get_extra_encompass_infos (); + + Drul_arraybool extra_encompass_dirs (false,false); + for (vsize i = 0; i extra_encompass_infos_.size (); i++) +{ + Direction d = get_grob_direction (extra_encompass_infos_[i].grob_); + if (d) +extra_encompass_dirs[d] = true; +} + if (extra_encompass_dirs[dir_]) +{ + Direction d = LEFT; + do +end_ys[d] += 2.0; // m4g1c + while (flip (d) != LEFT); +} + configurations_ = enumerate_attachments (end_ys); for (vsize i = 0; i columns_.size (); i++) encompass_infos_.push_back (get_encompass_info (columns_[i])); - extra_encompass_infos_ = get_extra_encompass_infos (); valid_ = true; musical_dy_ = 0.0; ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel