X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-formatting-problem.cc;h=f6d9675d648c423464fad05cc1247f77434b9981;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=d5bd961887a3f6f8d8c41aedc7179f22fda993e0;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index d5bd961887..f6d9675d64 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -163,24 +163,6 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, Y_AXIS, -dir); } } - else if (stem) - { - Grob *head = Stem::support_head (stem); - - /* - In case of invisible stem, don't pass x-center of heads. - */ - Real x_center = head->extent (x_refpoint_, X_AXIS).center (); - Interval x_ext; - x_ext[-dir] = x_center; - Interval y_ext; - for (vsize j = 0; j < head_boxes.size (); j++) - y_ext.unite (head_boxes[j][Y_AXIS]); - - insert_extent_into_skyline (&chord_outlines_[key], - Box (x_ext, y_ext), - Y_AXIS, -dir); - } Direction updowndir = DOWN; do @@ -219,7 +201,7 @@ Tie_formatting_problem::set_chord_outline (vector bounds, for (vsize i = 0; i < bounds.size (); i++) ranks.push_back (bounds[i]->get_column ()->get_rank ()); - vector_sort (ranks, less ()); + vector_sort (ranks, default_compare); uniq (ranks); for (vsize i = 0; i < ranks.size (); i++) @@ -885,6 +867,7 @@ Tie_formatting_problem::find_best_variation (Ties_configuration const &base, Ties_configuration Tie_formatting_problem::generate_optimal_chord_configuration () { + Ties_configuration base = generate_base_chord_configuration (); vector vars = generate_collision_variations (base);