X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=173a9ad981f3add800a0295f074f56a343b9bfc4;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=d91e1b9de43f4365b3d0550d0f38d5ec4fa8955b;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index d91e1b9de4..173a9ad981 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,134 +3,307 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2007 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 "grob.hh" +#include "pointer-group-interface.hh" +/* + TODO: let Dot_column communicate with stem via Note_column. +*/ +MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1); +SCM +Dot_column::side_position (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "dots", dots); + + for (vsize i = 0; i < dots.size (); i++) + { + 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); +} - -void -Dot_column::set_interface (Score_element* me) +struct Dot_position { + int pos_; + Direction dir_; + Grob *dot_; + bool extremal_head_; - Directional_element_interface::set (me, RIGHT); - - Axis_group_interface::set_interface (me); - Axis_group_interface::set_axes (me, X_AXIS,X_AXIS); -} + Dot_position () + { + dot_ = 0; + pos_ = 0; + dir_ = CENTER; + extremal_head_ = false; + } +}; -/* - Will fuck up in this case. +typedef map Dot_configuration; - X. . - X.X . - |X . - | - | - |X . - | - | +/* + Value CFG according. +*/ +int +dot_config_badness (Dot_configuration const &cfg) +{ + 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; - Should be smarter. - */ + t += demerit; + } + return t; +} -MAKE_SCHEME_CALLBACK(Dot_column,force_shift_callback,2); -SCM -Dot_column::force_shift_callback (SCM element_smob, SCM axis) +void +print_dot_configuration (Dot_configuration const &cfg) { - Score_element *me = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); - assert (a == Y_AXIS); - me = me->parent_l (X_AXIS); - SCM dots = me->get_elt_property ("dots"); - do_shifts (dots); - return gh_double2scm (0.0); + printf ("dotconf { "); + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + printf ("%d, ", i->first); + printf ("} \n"); } -SCM -Dot_column::do_shifts (SCM l) +/* + Shift K and following (preceding) entries up (down) as necessary to + prevent staffline collisions if D is up (down). + + If K is in CFG, then do nothing. +*/ + +Dot_configuration +shift_one (Dot_configuration const &cfg, + int k, Direction d) { - Link_array dots; - while (gh_pair_p (l)) + Dot_configuration new_cfg; + int offset = 0; + + if (d > 0) { - dots.push (unsmob_element (gh_car (l))); - l = gh_cdr (l); + 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; + + new_cfg[p] = i->second; + } + else + { + if (new_cfg.find (p) == new_cfg.end ()) + offset = 0; + new_cfg[p + offset] = i->second; + } + } } - - dots.sort (compare_position); - - if (dots.size () < 2) - return SCM_UNSPECIFIED; - Slice s; - s.set_empty (); - - Array taken_posns; - int conflicts = 0; - for (int i=0; i < dots.size (); i++) + else { - Real p = Staff_symbol_referencer::position_f (dots[i]); - for (int j=0; j < taken_posns.size (); j++) + Dot_configuration::const_iterator i (cfg.end ()); + do { - if (taken_posns[j] == (int) p) - conflicts++; + 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; + } } - taken_posns.push ((int)p); - s.unite (Slice ((int)p, - (int)p)); + while (i != cfg.begin ()); } - if (!conflicts) - return SCM_UNSPECIFIED; - - 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++) + return new_cfg; +} + +/* + Remove the collision in CFG either by shifting up or down, whichever + is best. +*/ +void +remove_collision (Dot_configuration &cfg, int p) +{ + bool collide = cfg.find (p) != cfg.end (); + + if (collide) { - Score_element * d = dots[i]; - Staff_symbol_referencer::set_position (d,pos); - } + 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); - return SCM_UNSPECIFIED; + cfg = (b_up < b_down) ? cfg_up : cfg_down; + } } -bool -Dot_column::has_interface (Score_element*m) +MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1); +SCM +Dot_column::calc_positioning_done (SCM smob) { - return m && m->has_interface (ly_symbol2scm ("dot-column-interface")); -} + 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++) + { + Dot_position dp; + dp.dot_ = dots[i]; + + Grob *note = dots[i]->get_parent (Y_AXIS); + if (note) + { + Grob *stem = unsmob_grob (note->get_object ("stem")); + if (stem) + dp.extremal_head_ = Stem::first_head (stem) == note; + } + + int p = Staff_symbol_referencer::get_rounded_position (dp.dot_); + /* icky, since this should go via a Staff_symbol_referencer + offset callback but adding a dot overwrites Y-offset. */ + p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0); + 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); + } + + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + /* + Junkme? + */ + Staff_symbol_referencer::set_position (i->second.dot_, i->first); + } + return SCM_BOOL_T; +} void -Dot_column::add_head (Score_element * me, Score_element *rh) +Dot_column::add_head (Grob *me, Grob *rh) { - Score_element * d = unsmob_element (rh->get_elt_property ("dot")); + Grob *d = unsmob_grob (rh->get_object ("dot")); if (d) { - Side_position::add_support (me,rh); + Side_position_interface::add_support (me, rh); - Pointer_group_interface gi (me, "dots"); - gi.add_element (d); - - d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS); + 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, + + "Groups dot objects so they form a column, and position dots so they do not " + "clash with staff lines ", + + /* properties */ + "dots " + "positioning-done " + "direction " + ); +