X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fnote-collision.hh;h=ae0f3271b0ce9bfe0fabe1705bfeb021b946084f;hb=fea33b81da974ff0627843dfc88a00b49cd2323c;hp=de6d4dd290b69374d4a8f1da90967d435db75106;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh
index de6d4dd290..ae0f3271b0 100644
--- a/lily/include/note-collision.hh
+++ b/lily/include/note-collision.hh
@@ -1,17 +1,28 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #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).
@@ -26,13 +37,12 @@
 class Note_collision_interface
 {
 public:
-  static SCM automatic_shift (Grob *, Drul_array< Link_array<Grob> >);
+  static SCM automatic_shift (Grob *, Drul_array<vector<Grob *> >);
   static SCM forced_shift (Grob *);
 
-  static Drul_array< Link_array<Grob> > get_clash_groups (Grob *me);
-  DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis));
-  static void do_shifts (Grob *);
+  static Drul_array<vector<Grob *> > get_clash_groups (Grob *me);
+  DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM smob));
   static void add_column (Grob *me, Grob *ncol);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 #endif // COLLISION_HH