X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=536ced40e5b7fb75b88b34893da3064ff3faa8bd;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=6448492b8f5f925b954fe9fb4064b4b0cb50cb2a;hpb=1b67b706db8d1098bd2724e99f99a22132c99c68;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 6448492b8f..536ced40e5 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -1,14 +1,25 @@ /* - rest-collision.cc -- implement Rest_collision + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "rest-collision.hh" -#include // ceil. +#include // ceil. using namespace std; #include "directional-element-interface.hh" @@ -23,30 +34,15 @@ using namespace std; #include "staff-symbol-referencer.hh" #include "stem.hh" #include "grob.hh" +#include "unpure-pure-container.hh" #include "warn.hh" - -MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1); -SCM -Rest_collision::force_shift_callback (SCM smob) -{ - Grob *them = unsmob_grob (smob); - if (Note_column::has_rests (them)) - { - Grob *collision = unsmob_grob (them->get_object ("rest-collision")); - - if (collision) - { - (void) collision->get_property ("positioning-done"); - } - } - return scm_from_double (0.0); -} +#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); /* @@ -55,9 +51,14 @@ 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)) - force_shift_callback (parent->self_scm ()); + + if (has_interface (parent) && Note_column::has_rests (parent)) + { + Grob *collision = unsmob (parent->get_object ("rest-collision")); + + if (collision) + (void) collision->get_property ("positioning-done"); + } return scm_from_double (0.0); } @@ -67,23 +68,27 @@ Rest_collision::add_column (Grob *me, Grob *p) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p); - /* - only add callback for the rests, since we don't move anything - else. - - (not?) - */ - add_offset_callback (p, Rest_collision::force_shift_callback_proc, Y_AXIS); 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); } } +static bool +rest_shift_less (Grob *const &r1, Grob *const &r2) +{ + Grob *col1 = r1->get_parent (X_AXIS); + Grob *col2 = r2->get_parent (X_AXIS); + return Note_column::shift_less (col1, col2); +} + /* TODO: look at horizontal-shift to determine ordering between rests for more than two voices. @@ -92,22 +97,25 @@ 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); extract_grob_set (me, "elements", elts); - vector rests; - vector notes; + vector rests; + vector notes; 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); + } } /* @@ -131,157 +139,151 @@ Rest_collision::calc_positioning_done (SCM smob) { /* - This is incomplete: in case of an uneven number of rests, the - center one should be centered on the staff. + This is incomplete: in case of an uneven number of rests, the + center one should be centered on the staff. */ - Drul_array > ordered_rests; + Drul_array > ordered_rests; for (vsize i = 0; i < rests.size (); i++) - { - Grob *r = Note_column::get_rest (rests[i]); - - Direction d = get_grob_direction (r); - if (d) - ordered_rests[d].push_back (rests[i]); - else - rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set")); - } - - Direction d = LEFT; - do - vector_sort (ordered_rests[d], Note_column::shift_less); - while (flip (&d) != LEFT) - ; - - do - { - if (ordered_rests[d].size () < 1) - { - if (ordered_rests[-d].size () > 1) - ordered_rests[-d][0]->warning (_ ("too many colliding rests")); - - return SCM_BOOL_T; - } - } - while (flip (&d) != LEFT); + { + Grob *r = Note_column::get_rest (rests[i]); + + Direction d = get_grob_direction (r); + if (d) + ordered_rests[d].push_back (r); + else + rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set")); + } + + for (LEFT_and_RIGHT (d)) + vector_sort (ordered_rests[d], rest_shift_less); + + for (LEFT_and_RIGHT (d)) + { + if (ordered_rests[d].size () < 1) + { + if (ordered_rests[-d].size () > 1) + ordered_rests[-d][0]->warning (_ ("too many colliding rests")); + + return SCM_BOOL_T; + } + } Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS); common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS); Real diff - = (ordered_rests[DOWN].back ()->extent (common, Y_AXIS)[UP] - - ordered_rests[UP].back ()->extent (common, Y_AXIS)[DOWN]) / staff_space; + = (ordered_rests[DOWN].back ()->extent (common, Y_AXIS)[UP] + - ordered_rests[UP].back ()->extent (common, Y_AXIS)[DOWN]) / staff_space; if (diff > 0) - { - int amount_down = (int) ceil (diff / 2); - diff -= amount_down; - Note_column::translate_rests (ordered_rests[DOWN].back (), - -2 * amount_down); - if (diff > 0) - Note_column::translate_rests (ordered_rests[UP].back (), - 2 * int (ceil (diff))); - } - - do - { - for (vsize i = ordered_rests[d].size () -1; i-- > 0;) - { - Real last_y = ordered_rests[d][i + 1]->extent (common, Y_AXIS)[d]; - Real y = ordered_rests[d][i]->extent (common, Y_AXIS)[-d]; - - Real diff = d * ((last_y - y) / staff_space); - if (diff > 0) - Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2); - } - } - while (flip (&d) != LEFT); + { + int amount_down = (int) ceil (diff / 2); + diff -= amount_down; + Rest::translate (ordered_rests[DOWN].back (), + -2 * amount_down); + if (diff > 0) + Rest::translate (ordered_rests[UP].back (), + 2 * int (ceil (diff))); + } + + for (LEFT_and_RIGHT (d)) + { + for (vsize i = ordered_rests[d].size () - 1; i-- > 0;) + { + Real last_y = ordered_rests[d][i + 1]->extent (common, Y_AXIS)[d]; + Real y = ordered_rests[d][i]->extent (common, Y_AXIS)[-d]; + + Real diff = d * ((last_y - y) / staff_space); + if (diff > 0) + Rest::translate (ordered_rests[d][i], d * (int) ceil (diff) * 2); + } + } } else { /* - Rests and notes. + Rests and notes. */ - if (rests.size () > 1) - warning (_ ("too many colliding rests")); - Grob *rcol = 0; - Direction dir = CENTER; - - for (vsize i = rests.size (); !rcol && i--;) - if (Note_column::dir (rests[i])) - { - rcol = rests[i]; - dir = Note_column::dir (rcol); - } - - if (!rcol) - return SCM_BOOL_T; - - Grob *rest = Note_column::get_rest (rcol); - Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); - - Interval restdim = rcol->extent (common, Y_AXIS); - if (restdim.is_empty ()) - return SCM_BOOL_T; - - Real staff_space = Staff_symbol_referencer::staff_space (rcol); - Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space; - - Interval notedim; - for (vsize i = 0; i < notes.size (); i++) - { - if (Note_column::dir (notes[i]) == -dir - // If the note has already happened (but it has a long duration, so there is a collision), - // don't look at the stem. If we do, the rest gets shifted down a lot and it looks bad. - || dynamic_cast (notes[i])->get_column () != dynamic_cast (rest)->get_column ()) - { - /* try not to look at the stem, as looking at a beamed - note may trigger beam positioning prematurely. - - This happens with dotted rests, which need Y - positioning to compute X-positioning. - */ - Grob *head = Note_column::first_head (notes[i]); - if (head) - notedim.unite (head->extent (common, Y_AXIS)); - else - programming_error ("Note_column without first_head()"); - } - else - notedim.unite (notes[i]->extent (common, Y_AXIS)); - } - - 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))); - - // move by whole spaces inside the staff. - if (fabs (Staff_symbol_referencer::get_position (rest) - + discrete_y) < stafflines + 1) - { - discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0); - } - - Note_column::translate_rests (rcol, discrete_y); + // Count how many rests we move + Drul_array rcount (0, 0); + + for (vsize i = 0; i < rests.size (); i++) + { + Grob *rcol = rests[i]; + Grob *rest = Note_column::get_rest (rcol); + + Direction dir = get_grob_direction (rest); + if (!dir) + dir = Note_column::dir (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"))) + continue; + + Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); + Interval restdim = rest->extent (common, Y_AXIS); + if (restdim.is_empty ()) + continue; + + Real staff_space = Staff_symbol_referencer::staff_space (rcol); + Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space; + + Interval notedim; + for (vsize i = 0; i < notes.size (); i++) + { + if (Note_column::dir (notes[i]) == -dir + // If the note has already happened (but it has a long + // duration, so there is a collision), don't look at the stem. + // If we do, the rest gets shifted down a lot and it looks bad. + || dynamic_cast (notes[i])->get_column () != dynamic_cast (rest)->get_column ()) + { + /* try not to look at the stem, as looking at a beamed + note may trigger beam positioning prematurely. + + This happens with dotted rests, which need Y + positioning to compute X-positioning. + */ + Grob *head = Note_column::first_head (notes[i]); + if (head) + notedim.unite (head->extent (common, Y_AXIS)); + else + programming_error ("Note_column without first_head()"); + } + else + notedim.unite (notes[i]->extent (common, Y_AXIS)); + } + + Real y = dir * max (0.0, + -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist); + + // 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 (staff_span.contains + (Staff_symbol_referencer::get_position (rest) + discrete_y)) + { + discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0); + } + + Rest::translate (rest, discrete_y); + if (rcount[dir]++) + rest->warning (_ ("too many colliding rests")); + } } return SCM_BOOL_T; } ADD_INTERFACE (Rest_collision, - "Move around ordinary rests (not multi-measure-rests) to avoid" - " conflicts.", - - /* properties */ - "minimum-distance " - "positioning-done " - "elements " - ); + "Move ordinary rests (not multi-measure nor pitched rests)" + " to avoid conflicts.", + + /* properties */ + "minimum-distance " + "positioning-done " + "elements " + );