X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=5f111a8581274bc026c21059f09da714f836a214;hb=9f6d0fb4a06f79989101ebfd22efdfb9013ab32b;hp=351feb2cc66c2ac64ffaca27e6e367ba2556a50f;hpb=4e4a7b852eada5ba5dd4f98da72c25b19c3cfcc3;p=lilypond.git diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 351feb2cc6..5f111a8581 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -1,149 +1,58 @@ /* - tie-column.cc -- implement Tie_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2015 Han-Wen Nienhuys - (c) 2000--2005 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ +#include "tie-column.hh" -#include -#include +#include -#include "staff-symbol-referencer.hh" +#include "output-def.hh" +#include "skyline.hh" #include "warn.hh" -#include "tie-column.hh" #include "paper-column.hh" #include "spanner.hh" #include "pointer-group-interface.hh" #include "tie.hh" #include "directional-element-interface.hh" -#include "rhythmic-head.hh" +#include "tie-formatting-problem.hh" +#include "tie-configuration.hh" + +using namespace std; void -Tie_column::add_tie (Grob *me, Grob *tie) +Tie_column::add_tie (Grob *tc, Spanner *tie) { + Spanner *me = dynamic_cast (tc); + if (tie->get_parent (Y_AXIS) - && Tie_column::has_interface (tie->get_parent (Y_AXIS))) + && has_interface (tie->get_parent (Y_AXIS))) return; - if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties"))) + if (!me->get_bound (LEFT) + || (Paper_column::get_rank (me->get_bound (LEFT)->get_column ()) + > Paper_column::get_rank (dynamic_cast (tie)->get_bound (LEFT)->get_column ()))) { - dynamic_cast (me)->set_bound (LEFT, Tie::head (tie, LEFT)); - dynamic_cast (me)->set_bound (RIGHT, Tie::head (tie, RIGHT)); + me->set_bound (LEFT, Tie::head (tie, LEFT)); + me->set_bound (RIGHT, Tie::head (tie, RIGHT)); } tie->set_parent (me, Y_AXIS); Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie); - tie->add_dependency (me); -} - -void -Tie_column::set_directions (Grob *me) -{ - if (!to_boolean (me->get_property ("positioning-done"))) - { - me->set_property ("positioning-done", SCM_BOOL_T); - new_directions (me); - } -} - -int -Tie::compare (Grob *const &s1, - Grob *const &s2) -{ - return sign (Tie::get_position (s1) - Tie::get_position (s2)); -} - -/* - Werner: - - . The algorithm to choose the direction of the ties doesn't work - properly. I suggest the following for applying ties sequentially - from top to bottom: - - + The topmost tie is always `up'. - - + If there is a vertical gap to the last note above larger than - or equal to a fifth (or sixth?), the tie is `up', otherwise it - is `down'. - - + The bottommost tie is always `down'. -*/ -void -Tie_column::werner_directions (Grob *me) -{ - extract_grob_set (me, "ties", ro_ties); - Link_array ties (ro_ties); - if (!ties.size ()) - return; - - ties.sort (&Tie::compare); - - Direction d = get_grob_direction (me); - if (d) - { - for (int i = ties.size (); i--;) - { - Grob *t = ties[i]; - if (!get_grob_direction (t)) - set_grob_direction (t, d); - } - return; - } - - if (ties.size () == 1) - { - Grob *t = ties[0]; - if (t->is_live () - && !get_grob_direction (t)) - set_grob_direction (t, Tie::get_default_dir (t)); - return; - } - - Real last_down_pos = 10000; - if (!get_grob_direction (ties[0])) - set_grob_direction (ties[0], DOWN); - - /* - Go downward. - */ - Grob *last_tie = 0; - for (int i = ties.size (); i--;) - { - Grob *t = ties[i]; - - Direction d = get_grob_direction (t); - Real p = Tie::get_position (t); - if (!d) - { - if (last_tie - && Tie::get_column_rank (t, LEFT) - < Tie::get_column_rank (last_tie, LEFT)) - d = DOWN; - else if (last_down_pos - p > 5) - d = UP; - else - d = DOWN; - - set_grob_direction (t, d); - } - - if (d == DOWN) - last_down_pos = p; - - last_tie = t; - } - - return; -} - -MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1); -SCM -Tie_column::after_line_breaking (SCM smob) -{ - set_directions (unsmob_grob (smob)); - return SCM_UNSPECIFIED; } /* @@ -153,200 +62,63 @@ MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1); SCM Tie_column::before_line_breaking (SCM smob) { - Spanner *me = dynamic_cast (unsmob_grob (smob)); + Spanner *me = unsmob (smob); for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s)) { - Spanner *tie = dynamic_cast (unsmob_grob (scm_car (s))); - Direction dir = LEFT; - do - { - if (dir * tie->get_bound (dir)->get_column ()->get_rank () - > dir * me->get_bound (dir)->get_column ()->get_rank ()) - me->set_bound (dir, Tie::head (tie, dir)); - } - while (flip (&dir) != LEFT); - } - return SCM_UNSPECIFIED; -} - -ADD_INTERFACE (Tie_column, "tie-column-interface", - "Object that sets directions of multiple ties in a tied chord", - "direction " - "positioning-done " - ); - - - - -bool -config_allowed (map const &allowed, - Tie_configuration conf) -{ - return allowed.find (conf) == allowed.end (); -} - -void -add_configuration (map *allowed, - Grob *tie_column, - Tie_configuration new_conf) -{ - bool on_line = Staff_symbol_referencer::on_staffline (tie_column, new_conf.position_); - - if (allowed->find (new_conf) != allowed->end () - && !(*allowed)[new_conf]) - { - programming_error ("Tie configuration not allowed"); - } - - - if (on_line) - { - Tie_configuration forbidden; - - forbidden.dir_ = -new_conf.dir_ ; - forbidden.position_ = new_conf.position_; - (*allowed)[forbidden] = false; - - forbidden.position_ += new_conf.dir_; - (*allowed)[forbidden] = false; - forbidden.position_ += new_conf.dir_; - (*allowed)[forbidden] = false; - - forbidden.dir_ = new_conf.dir_; - forbidden.position_ = new_conf.position_ + new_conf.dir_; - (*allowed)[forbidden] = false; + Spanner *tie = unsmob (scm_car (s)); + for (LEFT_and_RIGHT (dir)) + { + if (dir * tie->get_bound (dir)->get_column ()->get_rank () + > dir * me->get_bound (dir)->get_column ()->get_rank ()) + me->set_bound (dir, Tie::head (tie, dir)); + } } - else - { - Tie_configuration forbidden; - forbidden.dir_ = - new_conf.dir_; - forbidden.position_ = new_conf.position_; - - - (*allowed)[forbidden] = false; - forbidden.position_ -= new_conf.dir_; - forbidden.dir_ = new_conf.dir_; - (*allowed)[forbidden] = false; - forbidden.position_ += 2* new_conf.dir_; - (*allowed)[forbidden] = false; - } + return SCM_UNSPECIFIED; } - -void -Tie_column::new_directions (Grob *me) +MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1) +SCM +Tie_column::calc_positioning_done (SCM smob) { + Grob *me = unsmob (smob); extract_grob_set (me, "ties", ro_ties); - Link_array ties (ro_ties); + vector ties (ro_ties); if (!ties.size ()) - return; + return SCM_BOOL_T; - if (ties.size() == 1) - { - Tie::set_default_control_points (ties[0]); - return ; - } - - ties.sort (&Tie::compare); - Array tie_configs; - for (int i = 0; i < ties.size (); i++) - { - Tie_configuration conf; - conf.dir_ = get_grob_direction (ties[i]); - conf.position_ = (int) rint (Tie::get_position (ties[i])); - tie_configs.push (conf); - } + me->set_property ("positioning-done", SCM_BOOL_T); + vector_sort (ties, Tie::less); - - if (!tie_configs[0].dir_) - tie_configs[0].dir_ = DOWN; - if (!tie_configs.top().dir_) - tie_configs.top().dir_ = UP; + Tie_formatting_problem problem; + problem.from_ties (ties); + SCM manual_configs = me->get_property ("tie-configuration"); + problem.set_manual_tie_configuration (manual_configs); - /* - Seconds - */ - for (int i = 1; i < tie_configs.size(); i++) + Ties_configuration base = problem.generate_optimal_configuration (); + for (vsize i = 0; i < base.size (); i++) { - if (fabs (tie_configs[i-1].position_ - tie_configs[i].position_) <= 1) - { - if (!tie_configs[i-1].dir_) - tie_configs[i-1].dir_ = DOWN; - if (!tie_configs[i].dir_) - tie_configs[i].dir_ = UP; - } - } + SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (), + base[i], + problem.details_); - for (int i = 1; i < tie_configs.size() - 1; i++) - { - if (tie_configs[i].dir_) - continue; + ties[i]->set_property ("control-points", cp); + set_grob_direction (ties[i], + base[i].dir_); - tie_configs[i].dir_ = (Direction) sign (tie_configs[i].position_); - } - - Grob *common[NO_AXES] = { - me, me - }; - for (int i = 0; i < ties.size (); i++) - for (int a = X_AXIS; a < NO_AXES; a++) - { - Axis ax ((Axis) a); - - common[ax] = dynamic_cast (ties[i])->get_bound (LEFT)->common_refpoint (common[a], ax); - common[ax] = dynamic_cast (ties[i])->get_bound (RIGHT)->common_refpoint (common[a], ax); - } - - map allowed; - - Tie::get_configuration (ties[0], common, &tie_configs.elem_ref (0)); - Tie::get_configuration (ties.top (), common, - &tie_configs.elem_ref (tie_configs.size()-1)); - - add_configuration (&allowed, me, tie_configs[0]); - add_configuration (&allowed, me, tie_configs.top()); - - for (int i = 1; i < ties.size(); i++) - { - Tie_configuration conf = tie_configs[i]; - Tie::get_configuration (ties[i], common, &conf); - if (!config_allowed (allowed, conf)) - { - conf = tie_configs[i]; - - Direction d = LEFT; - do - { - conf.attachment_x_[d] = d * 1e6; // infty - for (int j = i - 1; j < i + 2; j++) - { - if (j >= 0 && j < ties.size()) - { - Spanner *t = dynamic_cast (ties[j]); - Interval ext - = robust_relative_extent (t->get_bound (d), - common[X_AXIS], X_AXIS); - conf.attachment_x_[d] - = d * min (d * conf.attachment_x_[d], d * ext[-d]); - } - } - } - while (flip (&d) != LEFT); - tie_configs[i] = conf; - } - else - tie_configs[i] = conf; - - add_configuration (&allowed, me, conf); - } - - for (int i = 0; i < ties.size(); i++) - { - Tie::set_control_points (ties[i], common, tie_configs[i]); - set_grob_direction (ties[i], tie_configs[i].dir_); + problem.set_debug_scoring (base); } + return SCM_BOOL_T; } +ADD_INTERFACE (Tie_column, + "Object that sets directions of multiple ties in a tied" + " chord.", + + /* properties */ + "positioning-done " + "tie-configuration " + "ties " + );