From 4b2bdb3f2c092e0c0030e795c4c5a464d5950ea5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 13 Dec 2005 15:59:57 +0000 Subject: [PATCH] * lily/tie-formatting-problem.cc (score_ties): new function (get_variations): new function. Try flipping dirs for collisions. (generate_optimal_chord_configuration): new function. 1-opt search for better configuration. * lily/tie-formatting-problem.cc (score_ties_aptitude): new function. (score_ties_configuration): new function. (generate_ties_configuration): new function. (generate_base_chord_configuration): new function. (set_ties_config_standard_directions): Move body from tie-column-format.cc (set_manual_tie_configuration): Move body from tie-column-format.cc * lily/tie-formatting-problem.cc (score_configuration): score tie/dot collisions. --- lily/tie-formatting-problem.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index ae23935241..a3d79b31a0 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -521,8 +521,11 @@ Tie_formatting_problem::generate_ties_configuration (Ties_configuration const &t { Tie_configuration * ptr = get_configuration (ties_config[i].position_, ties_config[i].dir_); if (specifications_[i].has_manual_position_) - ptr->delta_y_ = specifications_[i].manual_position_; - + { + ptr->delta_y_ + = (specifications_[i].manual_position_ - ties_config[i].position_) + * 0.5 * details_.staff_space_; + } copy.push (*ptr); } @@ -700,7 +703,7 @@ Tie_formatting_problem::set_manual_tie_configuration (SCM manual_configs) if (scm_is_number (scm_car (entry))) { spec.has_manual_position_ = true; - spec.manual_position_ = scm_to_double (scm_cdr (entry)); + spec.manual_position_ = scm_to_double (scm_car (entry)); } k ++; -- 2.39.2