X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=1698ef51eb8aa98da084c4804fd27b170f9a497b;hb=a8a2f0e0dbca1d9a03cea2ccb6c17b6cba58b66a;hp=6b0ebaeac1a11c4804fa2485f7d159942550e583;hpb=5027fa60c3a76dc406fb1ba8fb4a0e24c2ccf38e;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 6b0ebaeac1..1698ef51eb 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -11,6 +11,8 @@ #include #include #include +#include + using namespace std; #include "dots.hh" @@ -24,38 +26,9 @@ using namespace std; #include "grob.hh" #include "pointer-group-interface.hh" #include "dot-configuration.hh" - -/* - TODO: let Dot_column communicate with stem via Note_column. -*/ - -MAKE_SCHEME_CALLBACK (Dot_column, side_position, 1); -SCM -Dot_column::side_position (SCM smob) -{ - Grob *me = unsmob_grob (smob); - extract_grob_set (me, "dots", dots); - - for (vsize i = 0; i < dots.size (); i++) - { - Grob *head = dots[i]->get_parent (Y_AXIS); - Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0; - 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->get_property ("stem-end-position"); - } - } - - return Side_position_interface::x_aligned_side (smob, SCM_EOL); -} +#include "note-head.hh" +#include "rest.hh" +#include "dot-formatting-problem.hh" MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1); SCM @@ -63,38 +36,109 @@ Dot_column::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); + /* + 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"); + me->set_property ("positioning-done", SCM_BOOL_T); vector 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 main_heads; + Real ss = 0; + + 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; + + extract_grob_set(me, "side-support-elements", support); + + 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; + + 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); + + 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_configuration cfg; - for (vsize i = 0;i < dots.size (); i++) + Dot_formatting_problem problem (boxes, base_x); + + Dot_configuration cfg (problem); + for (vsize i = 0; i < dots.size (); i++) { Dot_position dp; dp.dot_ = dots[i]; @@ -105,6 +149,8 @@ Dot_column::calc_positioning_done (SCM smob) 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); } int p = Staff_symbol_referencer::get_rounded_position (dp.dot_); @@ -113,7 +159,6 @@ Dot_column::calc_positioning_done (SCM smob) 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")); @@ -123,6 +168,8 @@ Dot_column::calc_positioning_done (SCM smob) cfg.remove_collision (p); } + problem.register_configuration (cfg); + for (Dot_configuration::const_iterator i (cfg.begin ()); i != cfg.end (); i++) { @@ -131,6 +178,10 @@ Dot_column::calc_positioning_done (SCM smob) */ Staff_symbol_referencer::set_position (i->second.dot_, i->first); } + + + me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS), + X_AXIS); return SCM_BOOL_T; } @@ -144,6 +195,7 @@ Dot_column::add_head (Grob *me, Grob *rh) Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); d->set_property ("Y-offset", Grob::x_parent_positioning_proc); + d->set_property ("X-offset", Grob::x_parent_positioning_proc); Axis_group_interface::add_element (me, d); } } @@ -151,7 +203,7 @@ Dot_column::add_head (Grob *me, Grob *rh) ADD_INTERFACE (Dot_column, "Groups dot objects so they form a column, and position dots so they do not " - "clash with staff lines ", + "clash with staff lines. ", /* properties */ "dots "