X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=beff0f4f0f15fa226fc9a4f17b3d3573e43276b2;hb=f0da063c7a52889d36d0ee293b76c390096b0a1f;hp=29a5789a22a6d043b8a922d73a2e754f941cdd83;hpb=cd1c15ac06a3b427e6b4d22061939092751e4a1c;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 29a5789a22..beff0f4f0f 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,9 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ +#include +#include + #include "dots.hh" #include "dot-column.hh" #include "rhythmic-head.hh" @@ -14,102 +17,281 @@ #include "directional-element-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" +#include "stem.hh" +using std::set; -void -Dot_column::add_dots (Dots *d) +/* + TODO: let Dot_column communicate with stem via Note_column. + */ + +MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2); +SCM +Dot_column::force_shift_callback (SCM element_smob, SCM axis) { - Group_interface gi (this, "dots"); - gi.add_element (d); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + assert (a == Y_AXIS); + me = me->get_parent (X_AXIS); - add_dependency (d); - axis_group (this).add_element (d); + if (!to_boolean (me->get_grob_property ("collision-done"))) + { + me->set_grob_property ("collision-done", SCM_BOOL_T); + + do_shifts (me); + } + return gh_double2scm (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) gh_scm2int (axis); + assert (a == X_AXIS); + + Grob * stem = unsmob_grob (me->get_grob_property ("stem")); + if (stem + && !Stem::get_beam (stem) + && Stem::duration_log (stem) > 2 + && !Stem::invisible_b (stem) + ) + { + /* + trigger stem end & direction calculation. - side_position (this).add_support (r); - add_dots (r->dots_l ()); + 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 (Dots * const &d1, Dots * 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; -Dot_column::Dot_column () +/* + Value CFG according. + +*/ +int +dot_config_badness (Dot_configuration const &cfg) { - Group_interface gi (this, "dots"); - gi.set_interface (); - - directional_element (this).set (RIGHT); - axis_group (this).set_axes(X_AXIS,X_AXIS); + 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 +print_dot_configuration (Dot_configuration const &cfg) +{ + 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; + + 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; - Should be smarter. + 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; + } + } + } + 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 -Dot_column::after_line_breaking () +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; + } +} + +SCM +Dot_column::do_shifts (Grob*me) { - Link_array dots = Group_interface__extract_elements (this, (Dots*)0 , "dots"); - dots.sort (Dot_column::compare); + Link_array dots = + Pointer_group_interface__extract_grobs (me, (Grob*)0, "dots"); + + dots.sort (compare_position); + for (int i = dots.size (); i--;) + if (!dots[i]->live ()) + dots.del (i); - if (dots.size () < 2) - return; - 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_grob_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 = int (Staff_symbol_referencer::get_position (dp.dot_)); + dp.pos_= p; + + if (dp.extremal_head_) + dp.dir_ = to_dir (dp.dot_->get_grob_property ("direction")); + + remove_collision (cfg, p); + cfg[p] = dp; + if (Staff_symbol_referencer::on_staffline (dp.dot_, p)) + remove_collision (cfg, p); } - if (!conflicts) - return; - - 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 second.dot_, i->first); } + + return SCM_UNSPECIFIED; } + +void +Dot_column::add_head (Grob * me, Grob *rh) +{ + Grob * d = unsmob_grob (rh->get_grob_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", + "Interface that groups dots so they form a column", + "collision-done direction stem"); +