X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=8480362f1e8024a7cd337447c4464f2216a4021c;hb=eeb0e852589b3e90623ee589e0b6dfd2535d0688;hp=3b33e6e198f4d8fcfbfc5faf0a20e64f4abc0fa7;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 3b33e6e198..8480362f1e 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,13 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "dots.hh" #include "dot-column.hh" + +#include +#include +#include + +#include "dots.hh" #include "rhythmic-head.hh" -#include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" #include "side-position-interface.hh" @@ -25,27 +29,32 @@ SCM Dot_column::force_shift_callback (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); + Axis a = (Axis) scm_to_int (axis); assert (a == Y_AXIS); me = me->get_parent (X_AXIS); - SCM l = me->get_grob_property ("dots"); - do_shifts (l); - return gh_double2scm (0.0); + + 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); } -MAKE_SCHEME_CALLBACK(Dot_column,side_position, 2); +MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2); SCM Dot_column::side_position (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); + Axis a = (Axis) scm_to_int (axis); assert (a == X_AXIS); - Grob * stem = unsmob_grob (me->get_grob_property ("stem")); + Grob * stem = unsmob_grob (me->get_property ("stem")); if (stem && !Stem::get_beam (stem) && Stem::duration_log (stem) > 2 - && !Stem::invisible_b (stem) + && !Stem::is_invisible (stem) ) { /* @@ -59,79 +68,235 @@ Dot_column::side_position (SCM element_smob, SCM axis) } + +struct Dot_position +{ + int pos_; + Direction dir_; + Grob *dot_; + bool extremal_head_; + + + Dot_position () + { + dot_ = 0; + pos_ = 0; + dir_ = CENTER; + } +}; + + +typedef std::map Dot_configuration; + /* - Will fuck up in this case. + 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; +} + +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"); +} + +/* + 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; + 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; +} - Should be smarter. +/* + Remove the collision in CFG either by shifting up or down, whichever + is best. */ -SCM -Dot_column::do_shifts (SCM l) +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_grob (ly_car (l))); - l = ly_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; } +} + +SCM +Dot_column::do_shifts (Grob*me) +{ + 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_UNSPECIFIED; - 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::get_position (dots[i]); - 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 (dp.extremal_head_) + dp.dir_ = to_dir (dp.dot_->get_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 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++) + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) { - Grob * d = dots[i]; - Staff_symbol_referencer::set_position (d,pos); + Staff_symbol_referencer::set_position (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")); + Grob * d = unsmob_grob (rh->get_property ("dot")); if (d) { Side_position_interface::add_support (me,rh); @@ -146,6 +311,8 @@ Dot_column::add_head (Grob * me, Grob *rh) ADD_INTERFACE (Dot_column, "dot-column-interface", - "Interface that groups dots so they form a column", - "direction stem"); + "Groups dot objects so they form a column, and position dots so they do not " + "clash with staff lines " + , + "positioning-done direction stem");