X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=63dc2f76ee37e768cb1ee3ddd34fb1d0ce936371;hb=c05008764f5b4cf61e975e8f57bfe02be237d2ce;hp=ce660a24a287549ae3550f090d78dd96468d3b8c;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index ce660a24a2..63dc2f76ee 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,9 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ +#include +#include +#include + #include "dots.hh" #include "dot-column.hh" #include "rhythmic-head.hh" @@ -14,110 +18,301 @@ #include "directional-element-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" +#include "stem.hh" +/* + TODO: let Dot_column communicate with stem via Note_column. + */ -// todo: dots and elements duplicate each other. -void -Dot_column::add_dots (Item *d) +MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2); +SCM +Dot_column::force_shift_callback (SCM element_smob, SCM axis) { - Pointer_group_interface gi (this, "dots"); - gi.add_element (d); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) scm_to_int (axis); + assert (a == Y_AXIS); + me = me->get_parent (X_AXIS); - add_dependency (d); - Axis_group_interface (this).add_element (d); + if (!to_boolean (me->get_property ("positioning-done"))) + { + me->set_property ("positioning-done", SCM_BOOL_T); + + do_shifts (me); + } + return scm_make_real (0.0); } -void -Dot_column::add_head (Rhythmic_head *r) +MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2); +SCM +Dot_column::side_position (SCM element_smob, SCM axis) { - if (!r->dots_l ()) - return ; + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) scm_to_int (axis); + assert (a == X_AXIS); - Side_position_interface (this).add_support (r); - add_dots (r->dots_l ()); + Grob * stem = unsmob_grob (me->get_property ("stem")); + 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::stem_end_position (stem); + } + return Side_position_interface::aligned_side (element_smob, axis); } -int -Dot_column::compare (Item * const &d1, Item * const &d2) + +struct Dot_position { - Staff_symbol_referencer_interface s1(d1); - Staff_symbol_referencer_interface s2(d2); + int pos_; + Direction dir_; + Grob *dot_; + bool extremal_head_; + - return int (s1.position_f () - s2.position_f ()); -} + Dot_position () + { + dot_ = 0; + pos_ =0; + dir_ = CENTER; + } +}; + + +typedef std::map Dot_configuration; + +/* + 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; + + t += demerit; + } + return t; +} -Dot_column::Dot_column (SCM s) - : Item (s) +void +print_dot_configuration (Dot_configuration const &cfg) { - Pointer_group_interface gi (this, "dots"); - gi.set_interface (); - Directional_element_interface (this).set (RIGHT); - - Axis_group_interface (this).set_interface (); - Axis_group_interface (this).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). + + If K is in CFG, then do nothing. +*/ - X. . - X.X . - |X . - | - | - |X . - | - | +Dot_configuration +shift_one (Dot_configuration const &cfg, + int k, Direction d) +{ + Dot_configuration new_cfg; + int offset = 0; + + 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_staffline (i->second.dot_, p)) + p += d ; + else + p += 2* d; + offset = 2*d; - Should be smarter. + 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_staffline (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; +} + +/* + 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) + { + 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; + } +} -GLUE_SCORE_ELEMENT(Dot_column,after_line_breaking); SCM -Dot_column::member_after_line_breaking () +Dot_column::do_shifts (Grob*me) { - Link_array dots = Pointer_group_interface__extract_elements (this, (Item*)0 , "dots"); - dots.sort (Dot_column::compare); + Link_array dots = + Pointer_group_interface__extract_grobs (me, (Grob*)0, "dots"); + + { /* + Trigger note collision resolution first, since that may kill off + dots when merging. + */ + Grob * c = 0; + for (int 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 (int i = dots.size (); i-- ; ) + { + Grob * n = dots[i]->get_parent (Y_AXIS); + n->relative_coordinate (c , X_AXIS); + } + } + + dots.sort (compare_position); + for (int i = dots.size (); i--;) + if (!dots[i]->is_live ()) + dots.del (i); - 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++) + Dot_configuration cfg; + for (int 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_property ("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 (!conflicts) - return SCM_UNDEFINED; + if (dp.extremal_head_) + dp.dir_ = to_dir (dp.dot_->get_property ("direction")); - - 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++) + remove_collision (cfg, p); + cfg[p] = dp; + if (Staff_symbol_referencer::on_staffline (dp.dot_, p)) + remove_collision (cfg, p); + } + + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) { - staff_symbol_referencer (dots[i]).set_position(pos); + Staff_symbol_referencer::set_position (i->second.dot_, i->first); } - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; } + +void +Dot_column::add_head (Grob * me, Grob *rh) +{ + Grob * d = unsmob_grob (rh->get_property ("dot")); + if (d) + { + Side_position_interface::add_support (me,rh); + + Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); + d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS); + 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 " + , + "positioning-done direction stem"); +