X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=39c51fefc36ae0731c7d91a830bead7bf97a1258;hb=afa98722d22b2cc4c98254ff05c9ee164cf98bae;hp=e2e33530d40c306e455329b3cb5f58444b8191e5;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git diff --git a/lily/tie-column.cc b/lily/tie-column.cc index e2e33530d4..39c51fefc3 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -3,177 +3,138 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2006 Han-Wen Nienhuys */ #include "tie-column.hh" + +#include + +#include "output-def.hh" +#include "skyline.hh" +#include "warn.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-column-format.hh" +#include "tie-formatting-problem.hh" +#include "tie-configuration.hh" + +using namespace std; -/* - tie dir depends on what Tie_column does. -*/ -/* - TODO: this doesn't follow standard pattern. Regularize. -*/ void -Tie_column::add_tie (Grob *me, Grob *tie) +Tie_column::add_tie (Grob *tc, Grob *tie) { + Spanner *me = dynamic_cast (tc); + if (tie->get_parent (Y_AXIS) && Tie_column::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) -{ - werner_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'. + Extend the spanner over its Tie constituents. */ -void -Tie_column::werner_directions (Grob *me) +MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1); +SCM +Tie_column::before_line_breaking (SCM smob) { - 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) + Spanner *me = dynamic_cast (unsmob_grob (smob)); + for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s)) { - for (int i = ties.size (); i--;) + Spanner *tie = dynamic_cast (unsmob_grob (scm_car (s))); + Direction dir = LEFT; + do { - Grob *t = ties[i]; - if (!get_grob_direction (t)) - set_grob_direction (t, d); + 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)); } - 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; + while (flip (&dir) != LEFT); } + + return SCM_UNSPECIFIED; +} - Real last_down_pos = 10000; - if (!get_grob_direction (ties[0])) - set_grob_direction (ties[0], DOWN); +MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1) +SCM +Tie_column::calc_positioning_done (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "ties", ro_ties); + vector ties (ro_ties); + if (!ties.size ()) + return SCM_BOOL_T; - /* - Go downward. - */ - Grob *last_tie = 0; - for (int i = ties.size (); i--;) + if (ties.size() == 1) { - 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); - } + /* + Already handled by standard mechanisms. + */ + return SCM_BOOL_T; + } + + vector_sort (ties, Tie::less); - if (d == DOWN) - last_down_pos = p; + Tie_formatting_problem problem; + problem.from_ties (ties); - last_tie = t; - } + SCM manual_configs = me->get_property ("tie-configuration"); + problem.set_manual_tie_configuration (manual_configs); - return; -} -MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1); -SCM -Tie_column::after_line_breaking (SCM smob) -{ - werner_directions (unsmob_grob (smob)); - return SCM_UNSPECIFIED; -} + Ties_configuration base = problem.generate_optimal_chord_configuration (); -/* - Extend the spanner over its Tie constituents. -*/ -MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1); -SCM -Tie_column::before_line_breaking (SCM smob) -{ - Spanner *me = dynamic_cast (unsmob_grob (smob)); - for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s)) + for (vsize i = 0; i < base.size(); i++) { - Spanner *tie = dynamic_cast (unsmob_grob (scm_car (s))); - Direction dir = LEFT; - do + Tie::set_control_points (ties[i], problem.common_x_refpoint (), + base[i], + problem.details_); + set_grob_direction (ties[i], + base[i].dir_); + +#if DEBUG_TIE_SCORING + if (to_boolean (me->layout () + ->lookup_variable (ly_symbol2scm ("debug-tie-scoring")))) { - if (dir * Paper_column::get_rank (tie->get_bound (dir)->get_column ()) - > dir * Paper_column::get_rank (me->get_bound (dir)->get_column ())) - { - me->set_bound (dir, Tie::head (tie, dir)); - } + string card = to_string ("%d (%.2f): ", base[i].position_, base[i].delta_y_) + + base[i].card () + base.tie_card (i); + + + if (i == 0) + card += base.card (); + if (i == base.size () - 1) + card += to_string ("TOTAL=%.2f", base.score ()); + + ties[i]->set_property ("quant-score", + ly_string2scm (card)); } - while (flip (&dir) != LEFT); +#endif + } - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } -ADD_INTERFACE (Tie_column, "tie-column-interface", + + +ADD_INTERFACE (Tie_column, "Object that sets directions of multiple ties in a tied chord", - "direction"); + + /* properties */ + "positioning-done " + "tie-configuration " + );