X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=536ced40e5b7fb75b88b34893da3064ff3faa8bd;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=fc8a4b401d2880347f687c2b908d62f0d5140f3b;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index fc8a4b401d..536ced40e5 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,13 +34,15 @@ using namespace std; #include "staff-symbol-referencer.hh" #include "stem.hh" #include "grob.hh" +#include "unpure-pure-container.hh" #include "warn.hh" +#include "lily-imports.hh" MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, ""); SCM Rest_collision::force_shift_callback_rest (SCM rest, SCM offset) { - Grob *rest_grob = unsmob_grob (rest); + Grob *rest_grob = unsmob (rest); Grob *parent = rest_grob->get_parent (X_AXIS); /* @@ -50,9 +52,9 @@ Rest_collision::force_shift_callback_rest (SCM rest, SCM offset) if (scm_is_number (offset)) rest_grob->translate_axis (scm_to_double (offset), Y_AXIS); - if (Note_column::has_interface (parent) && Note_column::has_rests (parent)) + if (has_interface (parent) && Note_column::has_rests (parent)) { - Grob *collision = unsmob_grob (parent->get_object ("rest-collision")); + Grob *collision = unsmob (parent->get_object ("rest-collision")); if (collision) (void) collision->get_property ("positioning-done"); @@ -68,11 +70,14 @@ Rest_collision::add_column (Grob *me, Grob *p) p->set_object ("rest-collision", me->self_scm ()); - Grob *rest = unsmob_grob (p->get_object ("rest")); + Grob *rest = unsmob (p->get_object ("rest")); if (rest) { chain_offset_callback (rest, - Rest_collision::force_shift_callback_rest_proc, Y_AXIS); + Unpure_pure_container::make_smob + (Rest_collision::force_shift_callback_rest_proc, + Lily::pure_chain_offset_callback), + Y_AXIS); } } @@ -92,7 +97,7 @@ MAKE_SCHEME_CALLBACK (Rest_collision, calc_positioning_done, 1); SCM Rest_collision::calc_positioning_done (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); me->set_property ("positioning-done", SCM_BOOL_T); @@ -104,10 +109,13 @@ Rest_collision::calc_positioning_done (SCM smob) for (vsize i = 0; i < elts.size (); i++) { Grob *e = elts[i]; - if (unsmob_grob (e->get_object ("rest"))) - rests.push_back (e); - else - notes.push_back (e); + if (has_interface (e)) + { + if (unsmob (e->get_object ("rest"))) + rests.push_back (e); + else + notes.push_back (e); + } } /* @@ -146,13 +154,10 @@ Rest_collision::calc_positioning_done (SCM smob) rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set")); } - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) vector_sort (ordered_rests[d], rest_shift_less); - while (flip (&d) != LEFT) - ; - do + for (LEFT_and_RIGHT (d)) { if (ordered_rests[d].size () < 1) { @@ -162,7 +167,6 @@ Rest_collision::calc_positioning_done (SCM smob) return SCM_BOOL_T; } } - while (flip (&d) != LEFT); Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS); common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS); @@ -182,7 +186,7 @@ Rest_collision::calc_positioning_done (SCM smob) 2 * int (ceil (diff))); } - do + for (LEFT_and_RIGHT (d)) { for (vsize i = ordered_rests[d].size () - 1; i-- > 0;) { @@ -194,7 +198,6 @@ Rest_collision::calc_positioning_done (SCM smob) Rest::translate (ordered_rests[d][i], d * (int) ceil (diff) * 2); } } - while (flip (&d) != LEFT); } else { @@ -207,11 +210,12 @@ Rest_collision::calc_positioning_done (SCM smob) for (vsize i = 0; i < rests.size (); i++) { Grob *rcol = rests[i]; - Direction dir = Note_column::dir (rcol); + Grob *rest = Note_column::get_rest (rcol); + + Direction dir = get_grob_direction (rest); if (!dir) - continue; + dir = Note_column::dir (rcol); - Grob *rest = Note_column::get_rest (rcol); // Do not compute a translation for pre-positioned rests, // nor count them for the "too many colliding rests" warning if (scm_is_number (rest->get_property ("staff-position"))) @@ -253,19 +257,14 @@ Rest_collision::calc_positioning_done (SCM smob) Real y = dir * max (0.0, -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist); - int stafflines = Staff_symbol_referencer::line_count (me); - if (!stafflines) - { - programming_error ("no staff line count"); - stafflines = 5; - } - // move discretely by half spaces. int discrete_y = dir * int (ceil (y / (0.5 * dir * staff_space))); + Interval staff_span = Staff_symbol_referencer::staff_span (rest); + staff_span.widen (1); // move by whole spaces inside the staff. - if (fabs (Staff_symbol_referencer::get_position (rest) - + discrete_y) < stafflines + 1) + if (staff_span.contains + (Staff_symbol_referencer::get_position (rest) + discrete_y)) { discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0); }