X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=1a7f3cc601222ed66839b0c69b58cc65c05a0cc4;hb=3c9561d788078f7ee4a6e1d973cf549d8f258935;hp=a802c5cfa21802e7767fb2adb4f28b5e2cb91c7b;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index a802c5cfa2..1a7f3cc601 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,54 +3,316 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ +#include +#include +#include + #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" -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) { - dot_l_arr_.push (d); - add_dependency (d); - add_element (d); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) ly_scm2int (axis); + assert (a == Y_AXIS); + me = me->get_parent (X_AXIS); + + 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) ly_scm2int (axis); + assert (a == X_AXIS); + + 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); +} + + + +struct Dot_position +{ + int pos_; + Direction dir_; + Grob *dot_; + bool extremal_head_; + - head_l_arr_.push (r); - add_dependency (r); - add_dots (r->dots_l_); + 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; } void -Dot_column::do_substitute_dependency (Score_element*o,Score_element*n) +print_dot_configuration (Dot_configuration const &cfg) { - Item *oi =dynamic_cast (o); + 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. +*/ + +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 ()); + } - if (oi && dynamic_cast (oi)) - head_l_arr_.substitute (dynamic_cast (oi), - dynamic_cast(n)); - else if (oi && dynamic_cast (oi)) - dot_l_arr_.substitute (dynamic_cast (oi), - dynamic_cast (n)); + return new_cfg; } +/* + Remove the collision in CFG either by shifting up or down, whichever + is best. + */ void -Dot_column::do_pre_processing () +remove_collision (Dot_configuration &cfg, int p) { - Interval w; - for (int i=0; i < head_l_arr_.size (); i++) - w.unite (head_l_arr_[i]->extent (X_AXIS)); + 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 = + 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); + } + } - if (!w.empty_b ()) - translate_axis (w[RIGHT] - extent(X_AXIS) [LEFT],X_AXIS); + dots.sort (compare_position); + for (int i = dots.size (); i--;) + if (!dots[i]->is_live ()) + dots.del (i); + + Dot_configuration cfg; + for (int 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_property ("stem")); + if (stem) + dp.extremal_head_ = Stem::first_head (stem) == note; + } + + 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); + } + + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + 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_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"); +