X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=91c5f657c3bae6e542a59f5a4fa7cc6dc3c4c155;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2dc724e9f60cf22c4dad131de8eadf041361c4b1;hpb=ee513a2f7d18fc8d43e1c291350ed81856b0192d;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 2dc724e9f6..91c5f657c3 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,115 +3,212 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "dots.hh" #include "dot-column.hh" -#include "rhythmic-head.hh" -#include "group-interface.hh" -#include "staff-symbol-referencer.hh" + +#include +#include +#include +#include + +using namespace std; + +#include "axis-group-interface.hh" #include "directional-element-interface.hh" +#include "dot-column.hh" +#include "dot-configuration.hh" +#include "dot-formatting-problem.hh" +#include "dots.hh" +#include "grob.hh" +#include "note-head.hh" +#include "pointer-group-interface.hh" +#include "rest.hh" +#include "rhythmic-head.hh" #include "side-position-interface.hh" -#include "axis-group-interface.hh" - +#include "staff-symbol-referencer.hh" +#include "stem.hh" -// todo: dots and elements duplicate each other. -void -Dot_column::add_dots (Dots *d) +MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1); +SCM +Dot_column::calc_positioning_done (SCM smob) { - Group_interface gi (this, "dots"); - gi.add_element (d); + Grob *me = unsmob_grob (smob); - add_dependency (d); - Axis_group_interface (this).add_element (d); -} + /* + Trigger note collision resolution first, since that may kill off + dots when merging. + */ + if (Grob *collision = unsmob_grob (me->get_object ("note-collision"))) + (void) collision->get_property ("positioning-done"); -void -Dot_column::add_head (Rhythmic_head *r) -{ - if (!r->dots_l ()) - return ; + me->set_property ("positioning-done", SCM_BOOL_T); - side_position (this).add_support (r); - add_dots (r->dots_l ()); -} + vector dots + = extract_grob_array (me, "dots"); + vector main_heads; + Real ss = 0; -int -Dot_column::compare (Dots * const &d1, Dots * const &d2) -{ - Staff_symbol_referencer_interface s1(d1); - Staff_symbol_referencer_interface s2(d2); - - return int (s1.position_f () - s2.position_f ()); -} + Grob *commonx = me; + for (vsize i = 0; i < dots.size (); i++) + { + Grob *n = dots[i]->get_parent (Y_AXIS); + commonx = n->common_refpoint (commonx, X_AXIS); + + if (Grob *stem = unsmob_grob (n->get_object("stem"))) + { + commonx = stem->common_refpoint (commonx, X_AXIS); + + if (Stem::first_head (stem) == n) + main_heads.push_back (n); + } + } + vector boxes; + set stems; -Dot_column::Dot_column () -{ - Group_interface gi (this, "dots"); - gi.set_interface (); - directional_element (this).set (RIGHT); - - Axis_group_interface (this).set_interface (); - Axis_group_interface (this).set_axes(X_AXIS,X_AXIS); -} + extract_grob_set(me, "side-support-elements", support); -/* - Will fuck up in this case. + Interval base_x; + for (vsize i = 0; i < main_heads.size (); i++) + base_x.unite (main_heads[i]->extent (commonx, X_AXIS)); + + for (vsize i = 0; i < support.size (); i++) + { + Grob *s = support[i]; + if (!ss) + ss = Staff_symbol_referencer::staff_space (s); + + /* can't inspect Y extent of rest. + + Rest collisions should wait after line breaking. + */ + Interval y; + if (Rest::has_interface (s)) + { + base_x.unite (s->extent (commonx, X_AXIS)); + continue; + } + else if (Stem::has_interface (s)) + { + Real y1 = Stem::head_positions (s)[-get_grob_direction (s)]; + Real y2 = y1 + get_grob_direction (s) * 7; - X. . - X.X . - |X . - | - | - |X . - | - | + y.add_point (y1); + y.add_point (y2); + } + else + y = s->extent (s, Y_AXIS); + y *= 2 / ss; + y += Staff_symbol_referencer::get_position (s); + + Box b (s->extent (commonx, X_AXIS), y); + boxes.push_back (b); - Should be smarter. - */ -void -Dot_column::after_line_breaking () -{ - Link_array dots = Group_interface__extract_elements (this, (Dots*)0 , "dots"); - dots.sort (Dot_column::compare); - - if (dots.size () < 2) - return; - Slice s; - s.set_empty (); - - Array taken_posns; - int conflicts = 0; - for (int i=0; i < dots.size (); i++) + if (Grob *stem = unsmob_grob (s->get_object ("stem"))) + stems.insert (stem); + } + + for (set::const_iterator i(stems.begin()); + i != stems.end (); i++) + { + Grob *stem = (*i); + Stencil flag = Stem::flag (stem); + if (!flag.is_empty ()) + { + Interval y = flag.extent (Y_AXIS) + * (2 / ss) + + Stem::stem_end_position (stem); + + Interval x = stem->relative_coordinate (commonx, X_AXIS) + + flag.extent (X_AXIS); + + boxes.push_back (Box (x,y)); + } + } + + vector_sort (dots, position_less); + for (vsize i = dots.size (); i--;) + if (!dots[i]->is_live ()) + dots.erase (dots.begin () + i); + + Dot_formatting_problem problem (boxes, base_x); + + Dot_configuration cfg (problem); + for (vsize 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_object ("stem")); + if (stem) + dp.extremal_head_ = Stem::first_head (stem) == note; + + dp.x_extent_ = note->extent (commonx, X_AXIS); } - taken_posns.push ((int)p); - s.unite (Slice ((int)p, - (int)p)); + + int p = Staff_symbol_referencer::get_rounded_position (dp.dot_); + + /* icky, since this should go via a Staff_symbol_referencer + offset callback but adding a dot overwrites Y-offset. */ + p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0); + dp.pos_ = p; + if (dp.extremal_head_) + dp.dir_ = to_dir (dp.dot_->get_property ("direction")); + + cfg.remove_collision (p); + cfg[p] = dp; + if (Staff_symbol_referencer::on_line (dp.dot_, p)) + cfg.remove_collision (p); } - if (!conflicts) - return; + problem.register_configuration (cfg); + + for (Dot_configuration::const_iterator i (cfg.begin ()); + i != cfg.end (); i++) + { + /* + Junkme? + */ + Staff_symbol_referencer::set_position (i->second.dot_, i->first); + } - int middle = s.center (); - /* - +1 -> off by one - */ - int pos = middle - dots.size () + 1; - if (!(pos % 2)) - pos ++; // center () rounds down. + me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS), + X_AXIS); + return SCM_BOOL_T; +} - for (int i=0; i get_object ("dot")); + if (d) { - staff_symbol_referencer (dots[i]).set_position(pos); + Side_position_interface::add_support (me, head); + + Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); + d->set_property ("Y-offset", Grob::x_parent_positioning_proc); + // Dot formatting requests the Y-offset, -which- for rests may + // trigger post-linebreak callbacks. + if (!Rest::has_interface (head)) + d->set_property ("X-offset", Grob::x_parent_positioning_proc); + Axis_group_interface::add_element (me, d); } } + +ADD_INTERFACE (Dot_column, + "Group dot objects so they form a column, and position" + " dots so they do not clash with staff lines.", + + /* properties */ + "dots " + "positioning-done " + "direction " + ); +