X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsemi-tie-column.cc;h=c7d44a9568fa506c12196ba8f1285a97f45c137f;hb=2b7957caa0fe30768b6ca9beaf491b889bd0c1c4;hp=055b377c72107416ea3f7080a8e47232164a62fa;hpb=621e5fb6a5c3cb67c46082e561cffad691ead30c;p=lilypond.git diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc index 055b377c72..c7d44a9568 100644 --- a/lily/semi-tie-column.cc +++ b/lily/semi-tie-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2007 Han-Wen Nienhuys */ @@ -17,12 +17,10 @@ #include "staff-symbol-referencer.hh" #include "item.hh" #include "tie-formatting-problem.hh" -#include "tie-configuration.hh" #include "tie-column-format.hh" ADD_INTERFACE(Semi_tie_column, - "semi-tie-column-interface", "The interface for a column of l.v. ties.", /* properties */ @@ -57,14 +55,18 @@ Semi_tie_column::calc_positioning_done (SCM smob) SCM manual_configs = me->get_property ("tie-configuration"); problem.set_manual_tie_configuration (manual_configs); - Ties_configuration base = problem.generate_optimal_chord_configuration (); + Ties_configuration base = problem.generate_optimal_configuration (); for (vsize i = 0; i < lv_ties.size(); i++) { - Tie::set_control_points (lv_ties[i], problem.common_x_refpoint (), base[i], - problem.details_); + SCM cp = Tie::get_control_points (lv_ties[i], problem.common_x_refpoint (), base[i], + problem.details_); + + lv_ties[i]->set_property ("control-points", cp); set_grob_direction (lv_ties[i], base[i].dir_); - } + problem.set_debug_scoring (base); + } + return SCM_BOOL_T; }