X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=2017a5ce44ce7b72a74dc63f754c07367cc30cf8;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=16279f4f60036609e640f89451896fa24615edda;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 16279f4f60..2017a5ce44 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -1,204 +1,120 @@ -/* - tie-column.cc -- implement Tie_column - +/* + tie-column.cc -- implement Tie_column + source file of the GNU LilyPond music typesetter - - (c) 2000--2004 Han-Wen Nienhuys - - */ + + (c) 2000--2008 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 "group-interface.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 *s) +Tie_column::add_tie (Grob *tc, Grob *tie) { - if (s->get_parent (Y_AXIS) - && Tie_column::has_interface (s->get_parent (Y_AXIS))) - return ; + Spanner *me = dynamic_cast (tc); - if (! Pointer_group_interface::count (me, "ties")) + if (tie->get_parent (Y_AXIS) + && Tie_column::has_interface (tie->get_parent (Y_AXIS))) + return; + + 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 (s,LEFT)); - dynamic_cast (me)->set_bound (RIGHT, Tie::head (s,RIGHT)); + me->set_bound (LEFT, Tie::head (tie, LEFT)); + me->set_bound (RIGHT, Tie::head (tie, RIGHT)); } - s->set_parent (me, Y_AXIS); - Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s); - s->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)); + + tie->set_parent (me, Y_AXIS); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie); } /* - See [Ross p. 138]. - - - In normal chord cases, the outer ties point outwards, and the - direction of the rest is determined by their staff position. - - Ross forgets about the tie that is *on* the middle staff line. We - assume it goes UP. (TODO: make me settable) */ -void -Tie_column::old_directions (Grob*me) + Extend the spanner over its Tie constituents. +*/ +MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1); +SCM +Tie_column::before_line_breaking (SCM smob) { - Link_array ties = - Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties"); - - for (int i = ties.size (); i--;) - if (get_grob_direction (ties[i])) - ties.del (i); - - if (!ties.size ()) - return ; - - 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]; - 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]; - set_grob_direction (t,Tie::get_default_dir (t)); - return; - } - - ties.sort (tie_compare); - set_grob_direction (ties[0], DOWN); - ties.del (0); - - set_grob_direction (ties.pop (), UP); - for (int i = ties.size (); i--;) - { - Grob * t = ties[i]; - Real p = Tie::get_position (t); - Direction d = (Direction) sign (p); - if (!d) - d = UP; - set_grob_direction (t, d); + while (flip (&dir) != LEFT); } + return SCM_UNSPECIFIED; } -/* - -% . 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) +MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1) +SCM +Tie_column::calc_positioning_done (SCM smob) { - Link_array ties = - Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties"); - + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "ties", ro_ties); + vector ties (ro_ties); if (!ties.size ()) - return ; - - ties.sort (tie_compare); + return SCM_BOOL_T; - 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); - - 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_down_pos - p > 5) - { - d = UP; - } - else - { - d = DOWN; - } - - set_grob_direction (t, d); - } + me->set_property ("positioning-done", SCM_BOOL_T); - if (d == DOWN) - last_down_pos = p; - } + vector_sort (ties, Tie::less); - return ; -} + Tie_formatting_problem problem; + problem.from_ties (ties); + SCM manual_configs = me->get_property ("tie-configuration"); + problem.set_manual_tie_configuration (manual_configs); -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_configuration (); + + for (vsize i = 0; i < base.size (); i++) + { + SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (), + base[i], + problem.details_); + + ties[i]->set_property ("control-points", cp); + set_grob_direction (ties[i], + base[i].dir_); + + problem.set_debug_scoring (base); + } + return SCM_BOOL_T; } -ADD_INTERFACE (Tie_column,"tie-column-interface", - "Object that sets directions of multiple ties in a tied chord", - "direction"); +ADD_INTERFACE (Tie_column, + "Object that sets directions of multiple ties in a tied chord.", + + /* properties */ + "positioning-done " + "tie-configuration " + );