- Item *oi =dynamic_cast <Item *> (o);
-
- if (oi && dynamic_cast<Rhythmic_head *> (oi))
- head_l_arr_.substitute (dynamic_cast<Rhythmic_head*> (oi),
- dynamic_cast<Rhythmic_head*>(n));
- else if (oi && dynamic_cast<Dots *> (oi))
- dot_l_arr_.substitute (dynamic_cast<Dots*> (oi),
- dynamic_cast<Dots*> (n));
+ 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;
+ }
+}
+
+MAKE_SCHEME_CALLBACK(Dot_column, calc_positioning_done, 1);
+SCM
+Dot_column::calc_positioning_done (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ vector<Grob*> 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_);
+ 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;