X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=ee6935c7d8578526d0a31d13a20ad574831c3d30;hb=ec376e079a0dc586ba3fe17113993525f2be69c2;hp=899d22a5c725d65092c1277ca8b83d44a5bda602;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 899d22a5c7..ee6935c7d8 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -1,9 +1,20 @@ /* - 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--2010 Han-Wen Nienhuys - (c) 1997--2006 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" @@ -14,6 +25,7 @@ using namespace std; #include "directional-element-interface.hh" #include "duration.hh" #include "international.hh" +#include "item.hh" #include "note-column.hh" #include "output-def.hh" #include "pointer-group-interface.hh" @@ -21,26 +33,10 @@ using namespace std; #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" +#include "grob.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); -} - -MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1); +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, ""); SCM Rest_collision::force_shift_callback_rest (SCM rest, SCM offset) { @@ -54,8 +50,13 @@ 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 (Note_column::has_interface (parent) && Note_column::has_rests (parent)) + { + Grob *collision = unsmob_grob (parent->get_object ("rest-collision")); + + if (collision) + (void) collision->get_property ("positioning-done"); + } return scm_from_double (0.0); } @@ -65,13 +66,6 @@ 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")); @@ -86,11 +80,14 @@ Rest_collision::add_column (Grob *me, Grob *p) TODO: look at horizontal-shift to determine ordering between rests for more than two voices. */ -MAKE_SCHEME_CALLBACK(Rest_collision, calc_positioning_done, 1); +MAKE_SCHEME_CALLBACK (Rest_collision, calc_positioning_done, 1); SCM Rest_collision::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); + + me->set_property ("positioning-done", SCM_BOOL_T); + extract_grob_set (me, "elements", elts); vector rests; @@ -100,16 +97,7 @@ Rest_collision::calc_positioning_done (SCM smob) { Grob *e = elts[i]; if (unsmob_grob (e->get_object ("rest"))) - { - /* - Ignore rests under beam. - */ - Grob *st = unsmob_grob (e->get_object ("stem")); - if (st && unsmob_grob (st->get_object ("beam"))) - continue; - - rests.push_back (e); - } + rests.push_back (e); else notes.push_back (e); } @@ -125,7 +113,7 @@ Rest_collision::calc_positioning_done (SCM smob) no partners to collide with */ if (rests.size () + notes.size () < 2) - return SCM_UNSPECIFIED; + return SCM_BOOL_T; Real staff_space = Staff_symbol_referencer::staff_space (me); /* @@ -147,7 +135,7 @@ Rest_collision::calc_positioning_done (SCM smob) if (d) ordered_rests[d].push_back (rests[i]); else - rests[d]->warning (_ ("can't resolve rest collision: rest direction not set")); + rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set")); } Direction d = LEFT; @@ -163,7 +151,7 @@ Rest_collision::calc_positioning_done (SCM smob) if (ordered_rests[-d].size () > 1) ordered_rests[-d][0]->warning (_ ("too many colliding rests")); - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } } while (flip (&d) != LEFT); @@ -218,22 +206,41 @@ Rest_collision::calc_positioning_done (SCM smob) } if (!rcol) - return SCM_UNSPECIFIED; + 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); + Interval restdim = rest->extent (common, Y_AXIS); if (restdim.is_empty ()) - return SCM_UNSPECIFIED; + 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++) - notedim.unite (notes[i]->extent (common, Y_AXIS)); - + { + 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); @@ -257,15 +264,16 @@ Rest_collision::calc_positioning_done (SCM smob) Note_column::translate_rests (rcol, discrete_y); } - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } ADD_INTERFACE (Rest_collision, - "Move around ordinary rests (not multi-measure-rests) to avoid " - "conflicts.", + "Move around ordinary rests (not multi-measure-rests) to avoid" + " conflicts.", /* properties */ "minimum-distance " "positioning-done " - "elements"); + "elements " + );