X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=4683c51cb53faa05d0a0edef971ef1a2f81b9c61;hb=e240ae00f172f63596dd3ad0b9b66bb5ae739ce1;hp=f3ce19ad83713299b1da8145c5e567a6301a0308;hpb=a8651b61fa25aee299bbc846d180a942568d6075;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index f3ce19ad83..4683c51cb5 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,132 +3,303 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ +#include "dot-column.hh" + +#include +#include +#include +using namespace std; + #include "dots.hh" #include "dot-column.hh" #include "rhythmic-head.hh" -#include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" +#include "stem.hh" +#include "pointer-group-interface.hh" +/* + TODO: let Dot_column communicate with stem via Note_column. +*/ - -void -Dot_column::add_head (Score_element * dc, Score_element *rh) +MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1); +SCM +Dot_column::side_position (SCM smob) { - Score_element * d = unsmob_element (rh->get_elt_pointer ("dot")); - if (d) + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "dots", dots); + + for (vsize i = 0; i < dots.size (); i++) { - Side_position_interface (dc).add_support (rh); - - Pointer_group_interface gi (dc, "dots"); - gi.add_element (d); - - d->add_offset_callback (force_shift_callback , Y_AXIS); - Axis_group_interface (dc).add_element (d); + Grob *head = dots[i]->get_parent (Y_AXIS); + Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0; + if (stem + && !Stem::get_beam (stem) + && Stem::duration_log (stem) > 2 + && !Stem::is_invisible (stem)) + { + /* + trigger stem end & direction calculation. + + This will add the stem to the support if a flag collision happens. + */ + stem->get_property ("stem-end-position"); + } } + + return Side_position_interface::x_aligned_side (smob, SCM_EOL); } +struct Dot_position +{ + int pos_; + Direction dir_; + Grob *dot_; + bool extremal_head_; + Dot_position () + { + dot_ = 0; + pos_ = 0; + dir_ = CENTER; + extremal_head_ = false; + } +}; + +typedef map Dot_configuration; + +/* + Value CFG according. +*/ int -Dot_column::compare (Score_element * const &d1, Score_element * const &d2) +dot_config_badness (Dot_configuration const &cfg) { - Staff_symbol_referencer_interface s1(d1); - Staff_symbol_referencer_interface s2(d2); - - return int (s1.position_f () - s2.position_f ()); -} + int t = 0; + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + int p = i->first; + int demerit = sqr (p - i->second.pos_) * 2; + + int dot_move_dir = sign (p - i->second.pos_); + if (i->second.extremal_head_) + { + if (i->second.dir_ + && dot_move_dir != i->second.dir_) + demerit += 3; + else if (dot_move_dir != UP) + demerit += 2; + } + else if (dot_move_dir != UP) + demerit += 1; + t += demerit; + } + + return t; +} void -Dot_column::set_interface (Score_element* dc) +print_dot_configuration (Dot_configuration const &cfg) { - dc->set_elt_pointer ("dots", SCM_EOL); - Directional_element_interface (dc).set (RIGHT); - - Axis_group_interface (dc).set_interface (); - Axis_group_interface (dc).set_axes(X_AXIS,X_AXIS); + printf ("dotconf { "); + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + printf ("%d, ", i->first); + printf ("} \n"); } /* - Will fuck up in this case. + Shift K and following (preceding) entries up (down) as necessary to + prevent staffline collisions if D is up (down). - X. . - X.X . - |X . - | - | - |X . - | - | + If K is in CFG, then do nothing. +*/ +Dot_configuration +shift_one (Dot_configuration const &cfg, + int k, Direction d) +{ + Dot_configuration new_cfg; + int offset = 0; - Should be smarter. - */ + if (d > 0) + { + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + int p = i->first; + if (p == k) + { + if (Staff_symbol_referencer::on_line (i->second.dot_, p)) + p += d; + else + p += 2* d; + offset = 2*d; -Real -Dot_column::force_shift_callback (Score_element * dot, Axis a) -{ - assert (a == Y_AXIS); - Score_element * me = dot->parent_l (X_AXIS); - SCM dots = me->get_elt_pointer ("dots"); - do_shifts (dots); - return 0.0; + new_cfg[p] = i->second; + } + else + { + if (new_cfg.find (p) == new_cfg.end ()) + offset = 0; + new_cfg[p + offset] = i->second; + } + } + } + else + { + Dot_configuration::const_iterator i (cfg.end ()); + do + { + i--; + + int p = i->first; + if (p == k) + { + if (Staff_symbol_referencer::on_line (i->second.dot_, p)) + p += d; + else + p += 2* d; + + offset = 2*d; + + new_cfg[p] = i->second; + } + else + { + if (new_cfg.find (p) == new_cfg.end ()) + offset = 0; + + new_cfg[p + offset] = i->second; + } + } + while (i != cfg.begin ()); + } + + return new_cfg; } -SCM -Dot_column::do_shifts (SCM l) +/* + Remove the collision in CFG either by shifting up or down, whichever + is best. +*/ +void +remove_collision (Dot_configuration &cfg, int p) { - Link_array dots; - while (gh_pair_p (l)) + bool collide = cfg.find (p) != cfg.end (); + + if (collide) { - dots.push (unsmob_element (gh_car (l))); - l = gh_cdr (l); + Dot_configuration cfg_up = shift_one (cfg, p, UP); + Dot_configuration cfg_down = shift_one (cfg, p, DOWN); + + int b_up = dot_config_badness (cfg_up); + int b_down = dot_config_badness (cfg_down); + + cfg = (b_up < b_down) ? cfg_up : cfg_down; } - - dots.sort (Dot_column::compare); - - if (dots.size () < 2) - return SCM_UNDEFINED; - Slice s; - s.set_empty (); - - Array taken_posns; - int conflicts = 0; - for (int i=0; i < dots.size (); i++) +} + +MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1); +SCM +Dot_column::calc_positioning_done (SCM smob) +{ + Grob *me = unsmob_grob (smob); + vector dots + = extract_grob_array (me, "dots"); + + { /* + Trigger note collision resolution first, since that may kill off + dots when merging. + */ + Grob *c = 0; + for (vsize i = dots.size (); i--;) + { + Grob *n = dots[i]->get_parent (Y_AXIS); + if (c) + c = n->common_refpoint (c, X_AXIS); + else + c = n; + } + for (vsize i = dots.size (); i--;) + { + Grob *n = dots[i]->get_parent (Y_AXIS); + n->relative_coordinate (c, X_AXIS); + } + } + + vector_sort (dots, position_less); + for (vsize i = dots.size (); i--;) + if (!dots[i]->is_live ()) + dots.erase (dots.begin () + i); + + Dot_configuration cfg; + for (vsize i = 0;i < dots.size (); i++) { - Real p = Staff_symbol_referencer_interface (dots[i]).position_f (); - for (int j=0; j < taken_posns.size (); j++) + Dot_position dp; + dp.dot_ = dots[i]; + + Grob *note = dots[i]->get_parent (Y_AXIS); + if (note) { - if (taken_posns[j] == (int) p) - conflicts++; + Grob *stem = unsmob_grob (note->get_object ("stem")); + if (stem) + dp.extremal_head_ = Stem::first_head (stem) == note; } - taken_posns.push ((int)p); - s.unite (Slice ((int)p, - (int)p)); + + int p = Staff_symbol_referencer::get_rounded_position (dp.dot_); + dp.pos_ = p; + + if (dp.extremal_head_) + dp.dir_ = to_dir (dp.dot_->get_property ("direction")); + + remove_collision (cfg, p); + cfg[p] = dp; + if (Staff_symbol_referencer::on_line (dp.dot_, p)) + remove_collision (cfg, p); } - if (!conflicts) - return SCM_UNDEFINED; - - int middle = s.center (); - /* - +1 -> off by one - */ - int pos = middle - dots.size () + 1; - if (!(pos % 2)) - pos ++; // center () rounds down. - - for (int i=0; i < dots.size (); pos += 2, i++) + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) { - Score_element * d = dots[i]; - Staff_symbol_referencer_interface (d).set_position(pos); + /* + Junkme? + */ + Staff_symbol_referencer::set_position (i->second.dot_, i->first); } + return SCM_BOOL_T; +} - return SCM_UNDEFINED; +void +Dot_column::add_head (Grob *me, Grob *rh) +{ + Grob *d = unsmob_grob (rh->get_object ("dot")); + if (d) + { + Side_position_interface::add_support (me, rh); + + Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); + d->set_property ("Y-offset", Grob::x_parent_positioning_proc); + Axis_group_interface::add_element (me, d); + } } + +ADD_INTERFACE (Dot_column, + "dot-column-interface", + + "Groups dot objects so they form a column, and position dots so they do not " + "clash with staff lines ", + + /* properties */ + "dots " + "positioning-done " + "direction " + ); +