X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=be2adbab4336b56e75d596cce28a856ebb0433fa;hb=ee0488f3aa19e0060b6e17c46a4d88cb9d57c489;hp=82329d6328bdd40101b1d86b41883a48d3969a96;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh index 82329d6328..be2adbab43 100644 --- a/lily/include/note-collision.hh +++ b/lily/include/note-collision.hh @@ -1,40 +1,49 @@ /* - collision.hh -- declare 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--2005 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 . +*/ #ifndef COLLISION_HH #define COLLISION_HH +#include "std-vector.hh" +#include "grob-interface.hh" #include "lily-proto.hh" -#include "lily-guile.hh" -#include "parray.hh" + /** - Resolve conflicts between various Note_columns (chords). - - TODO + Resolve conflicts between various Note_columns (chords). - * multistaff support (see Chlapik: equal noteheads should be on the - same hpos.) + TODO - * Make interface of this, similar to align-interface. - -*/ + * multistaff support (see Chlapik: equal noteheads should be on the + same hpos.) + + * Make interface of this, similar to align-interface. + */ class Note_collision_interface { public: - static SCM automatic_shift (Grob*, Drul_array< Link_array >); - static SCM forced_shift (Grob*); - - static Drul_array< Link_array > get_clash_groups (Grob *me); - DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis)); - static void do_shifts (Grob*); - static void add_column (Grob*me, Grob*ncol); - static bool has_interface(Grob*); + static SCM automatic_shift (Grob *, Drul_array >); + static SCM forced_shift (Grob *); + + static Drul_array > get_clash_groups (Grob *me); + DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob)); + static void add_column (Grob *me, Grob *ncol); + DECLARE_GROB_INTERFACE(); }; #endif // COLLISION_HH